From 7683d4037b0c62f7a3d4e0d1a920286b3c303984 Mon Sep 17 00:00:00 2001 From: Jhen-Jie Hong Date: Sat, 21 Dec 2024 10:42:56 +0800 Subject: [PATCH] fix: try to fix windows build --- .github/workflows/release-build.yml | 6 ++---- scripts/build-windows.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index f6e9c78..81db2f7 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -34,21 +34,19 @@ jobs: - name: externals cache uses: actions/cache@v4.0.2 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/cache@v4.0.2 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 index addf794..c06a4cc 100644 --- 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