Clang on windows is now *really* clang on windows (surge-synthesizer#…

…7756) something which got lost in the last github actions upgrade.
nuoun · Aug 14, 2024 · 68494b1 · 68494b1
1 parent 6c59e38
commit 68494b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -19,43 +19,49 @@ jobs:
             cmakeConfig: -A x64
             cmakeOpt: DEBUG
             runTests: false
+
           - name: "windows msvc 32 bit"
             os: windows-latest
             target: surge-xt_Standalone
             cmakeConfig: -A Win32
             cmakeOpt: DEBUG
             runTests: false
+
           - name: "windows clang"
             os: windows-latest
             target: surge-xt_Standalone
-            cmakeConfig: -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
+            cmakeConfig: -GNinja -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
             cmakeOpt: DEBUG
             runTests: false
+
           - name: "ubuntu standalone"
             os: ubuntu-latest
             target: surge-xt_Standalone
-            cmakeConfig:
+            cmakeConfig: -GNinja
             cmakeOpt: DEBUG
             runTests: false
+
           - name: "macos standalone"
             os: macos-latest
             target: surge-xt_Standalone
-            cmakeConfig: -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+            cmakeConfig: -GNinja -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
             cmakeOpt: DEBUG
             runTests: false
 
           - name: "mac test runner"
             os: macos-latest
             target: surge-testrunner
-            cmakeConfig:
+            cmakeConfig: -GNinja
             cmakeOpt: RELEASE
             runTests: true
+
           - name: "linux test runner"
             os: ubuntu-latest
             target: surge-testrunner
-            cmakeConfig:
+            cmakeConfig: -GNinja
             cmakeOpt: RELEASE
             runTests: true
+
           - name: "windows test runner"
             os: windows-latest
             target: surge-testrunner
@@ -76,7 +82,7 @@ jobs:
 
       - name: Build pull request version
         run: |
-          cmake -S . -B ./build -DCMAKE_BUILD_TYPE=${{ matrix.cmakeOpt }} ${{ matrix.cmakeConfig }}
+          cmake -S . -B ./build ${{ matrix.cmakeConfig }} -DCMAKE_BUILD_TYPE=${{ matrix.cmakeOpt }}
           cmake --build ./build --config ${{ matrix.cmakeOpt }} --target ${{ matrix.target }} --parallel 3
 
       - name: Run Tests

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -52,7 +52,7 @@ jobs:
         include:
           - os: windows-latest
             name: windows-64bit
-            cmakeArgs: -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
+            cmakeArgs: -GNinja -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
           - os: windows-latest
             name: windows-32bit
             cmakeArgs: -A Win32