Skip to content

Commit 102f500

Browse files
committed
Add arm64 CI and update to macOS 14 build bot.
1 parent 0e8e1c4 commit 102f500

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/llvm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- { os: ubuntu-22.04, platform: arm64, cxx: g++-11, cc: gcc-11 }
1414
- { os: macos-11, platform: x64, cxx: clang++, cc: clang }
1515
- { os: macos-12, platform: x64, cxx: clang++, cc: clang }
16-
- { os: macos-12, platform: arm64, cxx: clang++, cc: clang }
16+
- { os: macos-14, platform: arm64, cxx: clang++, cc: clang }
1717

1818
runs-on: ${{ matrix.config.os }}
1919

.github/workflows/main.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
config:
1212
- { os: ubuntu-22.04, platform: x64, cxx: g++-11, cc: gcc-11 }
1313
- { os: macos-12, platform: x64, cxx: clang++, cc: clang }
14+
- { os: macos-14, platform: arm64, cxx: clang++, cc: clang }
1415
- { os: windows-2022, platform: x64, vs: "Program Files/Microsoft Visual Studio/2022" }
1516

1617
runs-on: ${{ matrix.config.os }}
@@ -30,10 +31,10 @@ jobs:
3031
fetch-depth: '0'
3132

3233
- name: Setup emsdk
33-
uses: mymindstorm/setup-emsdk@v11
34+
uses: mymindstorm/setup-emsdk@v14
3435
with:
3536
version: ${{ env.EMSCRIPTEN_VERSION }}
36-
actions-cache-folder: emsdk-cache-${{ runner.os }}
37+
actions-cache-folder: emsdk-cache-${{ runner.os }}-${{ matrix.config.platform }}
3738

3839
- name: Setup cmake
3940
uses: jwlawson/actions-setup-cmake@v2

build/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -e
2+
set -ex
33
builddir=$(cd "$(dirname "$0")"; pwd)
44
platform=x64
55
vs=vs2022

0 commit comments

Comments
 (0)