fix: try to fix windows build

mybigday · Dec 21, 2024 · 7683d40 · 7683d40
1 parent 23ef2bf
commit 7683d40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -34,21 +34,19 @@ jobs:
       - name: externals cache
         uses: actions/[email protected]
         if: runner.os != 'Windows'
-        env:
-          CMAKE_BUILD_PARALLEL_LEVEL: 4
         with:
           path: externals
           key: ${{ runner.os }}-externals-${{ hashFiles('scripts/prepare-*.sh') }}
       - name: externals cache (Windows)
         uses: actions/[email protected]
         if: runner.os == 'Windows'
-        env:
-          CMAKE_BUILD_PARALLEL_LEVEL: 4
         with:
           path: externals
           key: ${{ runner.os }}-externals-${{ hashFiles('scripts/prepare-*.ps1') }}
       - name: Install dependencies
         run: yarn install
+      - uses: msys2/setup-msys2@v2
+        if: runner.os == 'Windows'
       - name: Prepare & build (Windows)
         if: runner.os == 'Windows'
         env:

diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
@@ -3,9 +3,9 @@ $ErrorActionPreference='Stop'
 # General
 
 yarn clean ; yarn build-native -a x86_64
-yarn clean ; yarn build-native -a arm64
+yarn clean ; yarn build-native -a arm64 --CDCMAKE_C_COMPILER=clang --CDCMAKE_CXX_COMPILER=clang++ 
 
 # Vulkan, might crash on some scenario
 
 yarn clean ; yarn build-native -a x86_64 --CDVULKAN_SDK="$(Resolve-Path 'externals/win32-x64/Vulkan-SDK')" --CDVARIANT=vulkan --CDLLAMA_VULKAN=1
-yarn clean ; yarn build-native -a arm64 --CDVULKAN_SDK="$(Resolve-Path 'externals/win32-arm64/Vulkan-SDK')" --CDVARIANT=vulkan --CDLLAMA_VULKAN=1
+yarn clean ; yarn build-native -a arm64 --CDCMAKE_C_COMPILER=clang --CDCMAKE_CXX_COMPILER=clang++ --CDVULKAN_SDK="$(Resolve-Path 'externals/win32-arm64/Vulkan-SDK')" --CDVARIANT=vulkan --CDLLAMA_VULKAN=1