Skip to content

Commit 7ab78e9

Browse files
committed
fix: update macOS runners to macos-15 and use hermetic toolchain
The macOS 15 runner uses only llvm-16, but we want to build with llvm-19. Signed-off-by: Matt Leon <[email protected]>
1 parent 619bf90 commit 7ab78e9

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ build:hermetic --extra_toolchains @emsdk//emscripten_toolchain:cc-toolchain-wasm
7575
build:hermetic-llvm --config=hermetic
7676
build:hermetic-llvm --extra_toolchains @llvm_toolchain//:cc-toolchain-x86_64-linux
7777

78-
build:hermetic-llvm-macos-amd64 --config=hermetic
79-
build:hermetic-llvm-macos-amd64 --extra_toolchains @llvm_toolchain//:cc-toolchain-x86_64-darwin
78+
build:hermetic-llvm-macos-aarch64 --config=hermetic
79+
build:hermetic-llvm-macos-aarch64 --extra_toolchains @llvm_toolchain//:cc-toolchain-aarch64-darwin
8080

8181
build:hermetic-llvm --incompatible_enable_cc_toolchain_resolution
8282
build:hermetic-llvm --action_env BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1

.github/workflows/test.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ jobs:
175175
flags: --config=linux-aarch64-cross --@v8//bazel/config:v8_target_cpu=arm64
176176
deps: qemu-user-static libc6-arm64-cross
177177
cache: true
178-
- name: 'V8 on macOS/x86_64'
178+
- name: 'V8 on macOS/aarch64'
179179
engine: 'v8'
180180
repo: 'v8'
181181
os: macos-15
182-
arch: x86_64
182+
arch: aarch64
183183
action: test
184-
flags: --config=hermetic-llvm-macos-amd64
184+
flags: --config=hermetic-llvm-macos-aarch64
185185
cache: true
186186
- name: 'WAMR interp on Linux/x86_64'
187187
engine: 'wamr-interp'
@@ -190,11 +190,12 @@ jobs:
190190
arch: x86_64
191191
action: test
192192
flags: --config=clang
193-
- name: 'WAMR interp on macOS/x86_64'
193+
- name: 'WAMR interp on macOS/aarch64'
194194
engine: 'wamr-interp'
195195
repo: 'com_github_bytecodealliance_wasm_micro_runtime'
196-
os: macos-13
197-
arch: x86_64
196+
os: macos-15
197+
arch: aarch64
198+
flags: --config=hermetic-llvm-macos-aarch64
198199
action: test
199200
- name: 'WAMR jit on Linux/x86_64'
200201
engine: 'wamr-jit'
@@ -205,12 +206,13 @@ jobs:
205206
flags: --config=clang
206207
deps: lld-18
207208
cache: true
208-
- name: 'WAMR jit on macOS/x86_64'
209+
- name: 'WAMR jit on macOS/aarch64'
209210
engine: 'wamr-jit'
210211
repo: 'com_github_bytecodealliance_wasm_micro_runtime'
211-
os: macos-13
212-
arch: x86_64
212+
os: macos-15
213+
arch: aarch64
213214
action: test
215+
flags: --config=hermetic-llvm-macos-aarch64
214216
cache: true
215217
- name: 'WasmEdge on Linux/x86_64'
216218
engine: 'wasmedge'
@@ -219,11 +221,12 @@ jobs:
219221
arch: x86_64
220222
action: test
221223
flags: --config=clang
222-
- name: 'WasmEdge on macOS/x86_64'
224+
- name: 'WasmEdge on macOS/aarch64'
223225
engine: 'wasmedge'
224226
repo: 'com_github_wasmedge_wasmedge'
225-
os: macos-13
226-
arch: x86_64
227+
os: macos-15
228+
arch: aarch64
229+
flags: --config=hermetic-llvm-macos-aarch64
227230
action: test
228231
- name: 'Wasmtime on Linux/x86_64'
229232
engine: 'wasmtime'
@@ -257,11 +260,12 @@ jobs:
257260
# s390x build-tools image built from bazel/external/Dockerfile.bazel
258261
run_under: docker run --rm --env HOME=$HOME --env USER=$(id -un) --volume "$HOME:$HOME" --workdir $(pwd) --user $(id -u):$(id -g) --platform linux/s390x ghcr.io/proxy-wasm/build-tools:ubuntu-22.04-bazel-6.5.0
259262
cache: true
260-
- name: 'Wasmtime on macOS/x86_64'
263+
- name: 'Wasmtime on macOS/aarch64'
261264
engine: 'wasmtime'
262265
repo: 'com_github_bytecodealliance_wasmtime'
263-
os: macos-13
264-
arch: x86_64
266+
os: macos-15
267+
arch: aarch64
268+
flags: --config=hermetic-llvm-macos-aarch64
265269
action: test
266270

267271
steps:

0 commit comments

Comments
 (0)