Skip to content

Commit 8ff692c

Browse files
committed
fix: use macos-13 for runners
macos-15 uses too new a version of python which lacks support for `pipes`, which is used by our old foreign_cc version. ``` rules_foreign_cc: Printing build logs: /bin/bash -c bazel-out/darwin_arm64-opt-exec-2B5CBBC6-ST-1710242dce5b/bin/external/rules_foreign_cc/toolchains/ninja_tool_foreign_cc/wrapper_build_script.sh) _____ BEGIN BUILD LOGS _____ + ./configure.py --bootstrap Traceback (most recent call last): File "/private/var/tmp/_bazel_runner/f7b5b126cb65bf12475e292acf07553d/sandbox/darwin-sandbox/120/execroot/proxy_wasm_cpp_host/bazel-out/darwin_arm64-opt-exec-2B5CBBC6-ST-1710242dce5b/bin/external/rules_foreign_cc/toolchains/ninja.build_tmpdir/./configure.py", line 26, in <module> import pipes ModuleNotFoundError: No module named 'pipes' ``` Signed-off-by: Matt Leon <[email protected]>
1 parent 99f973b commit 8ff692c

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.bazelrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ 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-aarch64 --config=hermetic
79-
build:hermetic-llvm-macos-aarch64 --extra_toolchains @llvm_toolchain//:cc-toolchain-aarch64-darwin
78+
build:hermetic-llvm-macos-x86_64 --config=hermetic
79+
build:hermetic-llvm-macos-x86_64 --extra_toolchains @llvm_toolchain//:cc-toolchain-x86_64-darwin
8080
# Below flags mitigate https://github.com/bazel-contrib/toolchains_llvm/pull/229.
81-
build:hermetic-llvm-macos-aarch64 --features=-libtool
81+
build:hermetic-llvm-macos-x86_64 --features=-libtool
8282

8383
build:hermetic-llvm --incompatible_enable_cc_toolchain_resolution
8484
build:hermetic-llvm --action_env BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1

.github/workflows/test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ jobs:
178178
- name: 'V8 on macOS/x86_64'
179179
engine: 'v8'
180180
repo: 'v8'
181-
os: macos-15
181+
os: macos-13
182182
arch: x86_64
183183
action: test
184-
flags: --config=hermetic-llvm-macos-amd64
184+
flags: --config=hermetic-llvm-macos-x86_64
185185
cache: true
186186
- name: 'WAMR interp on Linux/x86_64'
187187
engine: 'wamr-interp'
@@ -195,6 +195,7 @@ jobs:
195195
repo: 'com_github_bytecodealliance_wasm_micro_runtime'
196196
os: macos-13
197197
arch: x86_64
198+
flags: --config=hermetic-llvm-macos-x86_64
198199
action: test
199200
- name: 'WAMR jit on Linux/x86_64'
200201
engine: 'wamr-jit'
@@ -211,6 +212,7 @@ jobs:
211212
os: macos-13
212213
arch: x86_64
213214
action: test
215+
flags: --config=hermetic-llvm-macos-x86_64
214216
cache: true
215217
- name: 'WasmEdge on Linux/x86_64'
216218
engine: 'wasmedge'
@@ -224,6 +226,7 @@ jobs:
224226
repo: 'com_github_wasmedge_wasmedge'
225227
os: macos-13
226228
arch: x86_64
229+
flags: --config=hermetic-llvm-macos-x86_64
227230
action: test
228231
- name: 'Wasmtime on Linux/x86_64'
229232
engine: 'wasmtime'
@@ -262,6 +265,7 @@ jobs:
262265
repo: 'com_github_bytecodealliance_wasmtime'
263266
os: macos-13
264267
arch: x86_64
268+
flags: --config=hermetic-llvm-macos-x86_64
265269
action: test
266270

267271
steps:

0 commit comments

Comments
 (0)