81 the dbghelp.dll file that ships in windows is not redistributable (#…

…83) * Adding dbghelp.dll to IGNORE_ITEM list for windows builds DIDN'T work * Forcing it to find the right dbghelp.dll (in C:\Windows\System32) did work
MODFLOW-USGS · Feb 5, 2023 · 9087218 · 9087218
1 parent 04e55dd
commit 9087218
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -136,30 +136,40 @@ jobs:
         with:
           arch: x64
 
-      - name: "*** Configure modelviewer-mf6 for release ***"
-        if: ${{ github.ref_name == 'master' }}
+      - name: "Configure modelviewer-mf6 for release"
+        if: ${{ github.ref_name == 'main' }}
         env:
           VTK_DIR: ${{ runner.workspace }}/qt5-vtk-${{ env.VTK_VER }}/lib/cmake
         run: cmake -S . -B ./_ninja_multi -G "Ninja Multi-Config" -DMV_SHORT_SHA1="${{ env.MV_SHORT_SHA1 }}" -DMV_DATE_COMPILED="${{ env.MV_DATE_COMPILED }}"
 
-      - name: "*** Configure modelviewer-mf6 for prerelease ***"
-        if: ${{ github.ref_name != 'master' }}
+      - name: "Configure modelviewer-mf6 for prerelease"
+        if: ${{ github.ref_name != 'main' }}
         env:
           VTK_DIR: ${{ runner.workspace }}/qt5-vtk-${{ env.VTK_VER }}/lib/cmake
           MV_VERSION_PRERELEASE: -prerelease.${{ github.run_number }}
         run: cmake -S . -B ./_ninja_multi -G "Ninja Multi-Config" -DMV_SHORT_SHA1="${{ env.MV_SHORT_SHA1 }}" -DMV_DATE_COMPILED="${{ env.MV_DATE_COMPILED }}" -DMV_VERSION_PRERELEASE="${{ env.MV_VERSION_PRERELEASE }}"
 
-      - name: "*** Build modelviewer-mf6 debug with cmake ***"
+      - name: "Build modelviewer-mf6 debug with cmake"
         run: cmake --build ./_ninja_multi --config Debug
 
-      - name: "*** Build modelviewer-mf6 release with cmake ***"
+      - name: "Build modelviewer-mf6 release with cmake"
         run: cmake --build ./_ninja_multi --config Release
 
-      - name: "*** Package modelviewer-mf6 release with cpack ***"
+      - name: "Package modelviewer-mf6 release with cpack"
+        if: runner.os != 'Windows'
         working-directory: ./_ninja_multi
         run: cpack --verbose
 
-      - name: "*** Upload package ***"
+      - name: "Package modelviewer-mf6 release with cpack (Windows)"
+        if: runner.os == 'Windows'
+        working-directory: ./_ninja_multi
+        run: |
+          Write-Output 'Prepend $env:SystemRoot\System32 to the path so that fixup_bundle finds the right dbghelp.dll'
+          Write-Output 'see https://github.com/MODFLOW-USGS/modelviewer-mf6/issues/81'
+          $env:PATH="$env:SystemRoot\System32;$env:PATH"
+          cpack --verbose
+
+      - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.config.os }}-artifact