Browse Source

Update Windows action. (#2018)

Jérémie Dumas 3 years ago
parent
commit
322db89acd
1 changed files with 8 additions and 14 deletions
  1. 8 14
      .github/workflows/continuous.yml

+ 8 - 14
.github/workflows/continuous.yml

@@ -78,7 +78,7 @@ jobs:
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DCMAKE_BUILD_TYPE=${{ matrix.config }} \
             -DLIBIGL_USE_STATIC_LIBRARY=${{ matrix.static }} \
-            -DLIBIGL_COPYLEFT_CGAL=ON 
+            -DLIBIGL_COPYLEFT_CGAL=ON
 
       - name: Build
         run: cd build; make -j2; ccache --show-stats
@@ -93,9 +93,6 @@ jobs:
   Windows:
     name: Windows (${{ matrix.config }}, ${{ fromJSON('["HeaderOnly", "Static"]')[matrix.static == 'ON'] }})
     runs-on: windows-2022
-    env:
-      CC: cl.exe
-      CXX: cl.exe
     strategy:
       fail-fast: false
       matrix:
@@ -106,9 +103,11 @@ jobs:
         uses: actions/checkout@v1
         with:
           fetch-depth: 10
-      - uses: seanmiddleditch/gha-setup-ninja@master
 
-      - name: Set env
+      - name: Install Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Set env variable for sccache
         run: |
           echo "appdata=$env:LOCALAPPDATA" >> ${env:GITHUB_ENV}
 
@@ -119,7 +118,6 @@ jobs:
           path: ${{ env.appdata }}\Mozilla\sccache
           key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.static }}-cache
 
-
       - name: Prepare sccache
         run: |
           iwr -useb 'https://raw.githubusercontent.com/scoopinstaller/install/master/install.ps1' -outfile 'install.ps1'
@@ -128,8 +126,6 @@ jobs:
           # Scoop modifies the PATH so we make it available for the next steps of the job
           echo "${env:PATH}" >> ${env:GITHUB_PATH}
 
-        # We run configure + build in the same step, since they both need to call VsDevCmd
-        # Also, cmd uses ^ to break commands into multiple lines (in powershell this is `)
       - name: Configure and build
         shell: cmd
         run: |
@@ -139,12 +135,10 @@ jobs:
             -DCMAKE_BUILD_TYPE=${{ matrix.config }} ^
             -DLIBIGL_USE_STATIC_LIBRARY=${{ matrix.static }} ^
             -DLIBIGL_COPYLEFT_CGAL=ON ^
-            -DCMAKE_JOB_POOLS=pool-linking=1;pool-compilation=1 ^
-            -DCMAKE_JOB_POOL_COMPILE:STRING=pool-compilation ^
-            -DCMAKE_JOB_POOL_LINK:STRING=pool-linking ^
             -B build ^
             -S .
-          cmake --build build
+          cmake --build build -j1
 
       - name: Tests
-        run: cd build; ctest --verbose
+        run: cd build; ctest --verbose -j2
+