Add arm64 CI and update to macOS 14 build bot.

mono · Oct 21, 2024 · 2ae87f8 · 2ae87f8
1 parent c13009c
commit 2ae87f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
@@ -13,7 +13,7 @@ jobs:
           - { os: ubuntu-22.04, platform: arm64, cxx: g++-11, cc: gcc-11 }
           - { os: macos-11, platform: x64, cxx: clang++, cc: clang }
           - { os: macos-12, platform: x64, cxx: clang++, cc: clang }
-          - { os: macos-12, platform: arm64, cxx: clang++, cc: clang }
+          - { os: macos-14, platform: arm64, cxx: clang++, cc: clang }
 
     runs-on: ${{ matrix.config.os }}
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,6 +11,7 @@ jobs:
         config:
           - { os: ubuntu-22.04, platform: x64, cxx: g++-11, cc: gcc-11 }
           - { os: macos-12, platform: x64, cxx: clang++, cc: clang }
+          - { os: macos-14, platform: arm64, cxx: clang++, cc: clang }
           - { os: windows-2022, platform: x64, vs: "Program Files/Microsoft Visual Studio/2022" }
 
     runs-on: ${{ matrix.config.os }}
@@ -30,10 +31,10 @@ jobs:
           fetch-depth: '0'
 
       - name: Setup emsdk
-        uses: mymindstorm/setup-emsdk@v11
+        uses: mymindstorm/setup-emsdk@v14
         with:
           version: ${{ env.EMSCRIPTEN_VERSION }}
-          actions-cache-folder: emsdk-cache-${{ runner.os }}
+          actions-cache-folder: emsdk-cache-${{ runner.os }}-${{ matrix.config.platform }}
 
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2

diff --git a/build/build.sh b/build/build.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 builddir=$(cd "$(dirname "$0")"; pwd)
 platform=x64
 vs=vs2022