Skip to content

Commit 56d6cb6

Browse files
committed
use macos-12 instead of macos-latest
this is because there seems to be an issue in our setup that breaks in the latest macos.
1 parent 0891f16 commit 56d6cb6

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
use_llvm: true
5353
build_wasm: true
5454
- build: macos-x64
55-
os: macos-latest
55+
os: macos-12
5656
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-darwin-amd64.tar.xz'
5757
artifact_name: 'wasmer-darwin-amd64'
5858
cross_compilation_artifact_name: 'cross_compiled_from_mac'
@@ -100,7 +100,7 @@ jobs:
100100
- uses: Swatinem/rust-cache@v2
101101
if: matrix.use_sccache != true
102102
- name: Install LLVM (macOS Apple Silicon)
103-
if: matrix.os == 'macos-latest' && !matrix.llvm_url
103+
if: matrix.os == 'macos-12' && !matrix.llvm_url
104104
run: |
105105
brew install llvm
106106
- name: Install LLVM
@@ -129,7 +129,7 @@ jobs:
129129
# using gnu-tar is a workaround for https://github.com/actions/cache/issues/403
130130
brew install gnu-tar
131131
echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV
132-
if: matrix.os == 'macos-latest'
132+
if: matrix.os == 'macos-12'
133133
- uses: actions/cache@v2
134134
with:
135135
path: |
@@ -314,7 +314,7 @@ jobs:
314314

315315
darwin_aarch64_jsc:
316316
name: macOS aarch64 (JSC)
317-
runs-on: macos-latest
317+
runs-on: macos-12
318318
steps:
319319
- uses: actions/checkout@v3
320320
- uses: dtolnay/rust-toolchain@stable
@@ -347,7 +347,7 @@ jobs:
347347

348348
darwin_x86_64_jsc:
349349
name: macOS x86_64 (JSC)
350-
runs-on: macos-latest
350+
runs-on: macos-12
351351
steps:
352352
- uses: actions/checkout@v3
353353
- uses: dtolnay/rust-toolchain@stable

.github/workflows/test.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,13 @@ jobs:
371371
},
372372
{
373373
build: macos-x64,
374-
os: macos-latest,
374+
os: macos-12,
375375
target: x86_64-apple-darwin,
376376
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz'
377377
},
378378
{
379379
build: macos-arm,
380-
os: macos-latest,
380+
os: macos-12,
381381
target: aarch64-apple-darwin,
382382
},
383383
{
@@ -413,7 +413,7 @@ jobs:
413413
# using gnu-tar is a workaround for https://github.com/actions/cache/issues/403
414414
brew install gnu-tar
415415
echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV
416-
if: matrix.metadata.os == 'macos-latest'
416+
if: matrix.metadata.os == 'macos-12'
417417
- name: Install Rust
418418
uses: dtolnay/rust-toolchain@stable
419419
with:
@@ -454,7 +454,7 @@ jobs:
454454
mkdir -p package/winsdk
455455
cp -r /tmp/winsdk/* package/winsdk
456456
- name: Install LLVM (macOS Apple Silicon)
457-
if: matrix.metadata.os == 'macos-latest' && !matrix.metadata.llvm_url
457+
if: matrix.metadata.os == 'macos-12' && !matrix.metadata.llvm_url
458458
run: |
459459
brew install llvm
460460
- name: Install LLVM
@@ -596,7 +596,7 @@ jobs:
596596
},
597597
{
598598
build: macos-x64,
599-
os: macos-latest,
599+
os: macos-12,
600600
target: x86_64-apple-darwin,
601601
exe: '',
602602
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz'
@@ -643,7 +643,7 @@ jobs:
643643
# using gnu-tar is a workaround for https://github.com/actions/cache/issues/403
644644
brew install gnu-tar
645645
echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV
646-
if: matrix.metadata.os == 'macos-latest'
646+
if: matrix.metadata.os == 'macos-12'
647647
- name: Install Rust
648648
uses: dtolnay/rust-toolchain@stable
649649
with:
@@ -652,7 +652,7 @@ jobs:
652652
- name: Install Nextest
653653
uses: taiki-e/install-action@nextest
654654
- name: Install LLVM (macOS Apple Silicon)
655-
if: matrix.metadata.os == 'macos-latest' && !matrix.metadata.llvm_url
655+
if: matrix.metadata.os == 'macos-12' && !matrix.metadata.llvm_url
656656
run: |
657657
brew install llvm
658658
- name: Install LLVM
@@ -710,12 +710,12 @@ jobs:
710710
target: x86_64-unknown-linux-gnu
711711
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz'
712712
- build: macos-x64
713-
os: macos-latest
713+
os: macos-12
714714
target: x86_64-apple-darwin
715715
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz'
716716
# we only build the integration-test CLI, we don't run tests
717717
- build: macos-arm
718-
os: macos-latest
718+
os: macos-12
719719
target: aarch64-apple-darwin,
720720
- build: linux-musl
721721
target: x86_64-unknown-linux-musl

0 commit comments

Comments
 (0)