Merge pull request #4 from pierre-guillou/heads/5.10.0

Fix NSIS filepath limitation
topology-tool-kit · Jan 21, 2022 · 279437f · 279437f
2 parents 255d4fa + ca87aab
commit 279437f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/headless.yml b/.github/workflows/headless.yml
@@ -138,33 +138,35 @@ jobs:
       shell: cmd
       run: |
         call "%VCVARS%"
-        mkdir build
-        cd build
+        cd ..
+        mkdir b
+        cd b
         cmake ^
           -DPARAVIEW_USE_QT=OFF ^
           -DPython3_ROOT_DIR="%CONDA_ROOT%" ^
           -DCMAKE_BUILD_TYPE=Release ^
           -GNinja ^
-          ..
+          %GITHUB_WORKSPACE%
 
     - name: Build ParaView
       shell: cmd
       run: |
         call "%VCVARS%"
-        cd build
+        cd ..\b
         cmake --build . --config Release --parallel
 
     - name: Create ParaView package
       shell: bash
       run: |
-        cd build
+        cd ../b
         cpack -G NSIS64
+        mv ttk-paraview.exe $GITHUB_WORKSPACE
 
     - name: Upload install executable
       uses: actions/upload-artifact@v2
       with:
         name: ttk-paraview-headless-windows
-        path: build/ttk-paraview.exe
+        path: ttk-paraview.exe
 
 
   # --------------------- #

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -159,32 +159,34 @@ jobs:
       shell: cmd
       run: |
         call "%VCVARS%"
-        mkdir build
-        cd build
+        cd ..
+        mkdir b
+        cd b
         cmake ^
           -DPython3_ROOT_DIR="%CONDA_ROOT%" ^
           -DCMAKE_BUILD_TYPE=Release ^
           -GNinja ^
-          ..
+          %GITHUB_WORKSPACE%
 
     - name: Build patched ParaView
       shell: cmd
       run: |
         call "%VCVARS%"
-        cd build
+        cd ..\b
         cmake --build . --config Release --parallel
 
     - name: Create package
       shell: bash
       run: |
-        cd build
+        cd ../b
         cpack -G NSIS64
+        mv ttk-paraview.exe $GITHUB_WORKSPACE
 
     - name: Upload .exe installer
       uses: actions/upload-artifact@v2
       with:
         name: ttk-paraview.exe
-        path: build/ttk-paraview.exe
+        path: ttk-paraview.exe
 
   create-release:
     runs-on: ubuntu-latest