From fc50fb2c59b04c7440b6464bf73bd5cef2f6f21a Mon Sep 17 00:00:00 2001
From: Aaron Colwell <300262+acolwell@users.noreply.github.com>
Date: Thu, 30 May 2024 17:36:35 -0700
Subject: [PATCH] Fix Windows build failure caused by missing dependency.
 (#969)

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.
---
 .github/workflows/build_installer.yml | 27 ++++++++++++++-------------
 tools/jenkins/genDllVersions.sh       |  1 +
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_installer.yml b/.github/workflows/build_installer.yml
index 9b9ddee8d..88ef98651 100644
--- a/.github/workflows/build_installer.yml
+++ b/.github/workflows/build_installer.yml
@@ -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 }}
@@ -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)
@@ -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:
@@ -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
diff --git a/tools/jenkins/genDllVersions.sh b/tools/jenkins/genDllVersions.sh
index a6fcde0ae..8b62a50b0 100755
--- a/tools/jenkins/genDllVersions.sh
+++ b/tools/jenkins/genDllVersions.sh
@@ -169,6 +169,7 @@ catDll libmodplug-
 catDll libmp3lame-
 catDll libnettle-
 catDll libnghttp2-
+catDll libnghttp3-
 catDll libogg-
 catDll libopenal-
 catDll libOpenColorIO