Skip to content

Commit

Permalink
Fix Windows build failure caused by missing dependency. (#969)
Browse files Browse the repository at this point in the history
Msys2's libcurl package was recently updated to enable HTTP/3
support which means it now also depends on libnghttp3.
genDllVersions.sh was updated to include this new dependency.

The Windows installer build action was also changed to upload its
build artifacts before it tests to make sure the plugins load. This
makes it possible to look at the generated artifacts for missing
dependencies if the plugin load verification fails.
  • Loading branch information
acolwell committed Jul 2, 2024
1 parent c7767b1 commit cc47b65
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
27 changes: 14 additions & 13 deletions .github/workflows/build_installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ jobs:
run: |
pacman -Rs --noconfirm mingw-w64-x86_64-natron-build-deps-qt5
- name: Upload artifacts
uses: actions/upload-artifact@v4.3.1
with:
name: ${{ steps.build.outputs.INSTALLER_NAME }}
path: ${{ steps.build.outputs.INSTALLER_DIR }}

- name: Verify plugin loading
run: |
INSTALLER_DIR=$(cygpath -u '${{ steps.build.outputs.INSTALLER_DIR }}')/${{ steps.build.outputs.INSTALLER_NAME }}
Expand All @@ -75,11 +81,6 @@ jobs:
PATH=${INSTALLER_DIR}/bin ./verify_plugin_loads.exe "${x}"
done
- name: Upload artifacts
uses: actions/upload-artifact@v4.3.1
with:
name: ${{ steps.build.outputs.INSTALLER_NAME }}
path: ${{ steps.build.outputs.INSTALLER_DIR }}
win-installer-breakpad:
name: Windows Installer (with Breakpad crash reporting)
Expand Down Expand Up @@ -149,14 +150,6 @@ jobs:
run: |
pacman -Rs --noconfirm mingw-w64-x86_64-natron-build-deps-qt5
- name: Verify plugin loading
run: |
INSTALLER_DIR=$(cygpath -u '${{ steps.build.outputs.INSTALLER_DIR }}')/${{ steps.build.outputs.INSTALLER_NAME }}
for x in $(find ${INSTALLER_DIR}/Plugins -name *.ofx); do
echo "Testing $(basename ${x}) ..."
PATH=${INSTALLER_DIR}/bin ./verify_plugin_loads.exe "${x}"
done
- name: Upload installer
uses: actions/upload-artifact@v4.3.1
with:
Expand All @@ -168,3 +161,11 @@ jobs:
with:
name: ${{ steps.build.outputs.SYMBOLS_NAME }}
path: ${{ steps.build.outputs.SYMBOLS_DIR }}

- name: Verify plugin loading
run: |
INSTALLER_DIR=$(cygpath -u '${{ steps.build.outputs.INSTALLER_DIR }}')/${{ steps.build.outputs.INSTALLER_NAME }}
for x in $(find ${INSTALLER_DIR}/Plugins -name *.ofx); do
echo "Testing $(basename ${x}) ..."
PATH=${INSTALLER_DIR}/bin ./verify_plugin_loads.exe "${x}"
done
1 change: 1 addition & 0 deletions tools/jenkins/genDllVersions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ catDll libmodplug-
catDll libmp3lame-
catDll libnettle-
catDll libnghttp2-
catDll libnghttp3-
catDll libogg-
catDll libopenal-
catDll libOpenColorIO
Expand Down

0 comments on commit cc47b65

Please sign in to comment.