Skip to content

Commit afe35ba

Browse files
committed
ci(macos): run x64 workflows with Rosetta 2
1 parent 658d317 commit afe35ba

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,13 +1068,12 @@ jobs:
10681068
run: |
10691069
cargo install cargo-cache --no-default-features --features ci-autoclean
10701070
cargo-cache
1071-
10721071
# This is ci/actions-templates/macos-builds-template.yaml
10731072
# Do not edit this file in .github/workflows
10741073
build-macos-x86_64: # job-name skip-aarch64
1075-
runs-on: macos-13 # skip-aarch64
10761074
env: # skip-aarch64
10771075
MACOSX_DEPLOYMENT_TARGET: 10.12 # skip-aarch64
1076+
runs-on: macos-latest
10781077
permissions:
10791078
id-token: write
10801079
contents: read
@@ -1143,6 +1142,7 @@ jobs:
11431142
- name: Run a full build and test
11441143
env:
11451144
BUILD_PROFILE: ${{ matrix.mode }}
1145+
shell: arch -x86_64 bash -e {0} # skip-aarch64
11461146
run: bash ci/run.bash
11471147
- name: Dump dynamic link targets
11481148
if: matrix.mode == 'release'
@@ -1200,13 +1200,12 @@ jobs:
12001200
# https://github.com/actions/cache/issues/403 and
12011201
# https://github.com/rust-lang/cargo/issues/8603.
12021202
run: sudo /usr/sbin/purge
1203-
12041203
# This is ci/actions-templates/macos-builds-template.yaml
12051204
# Do not edit this file in .github/workflows
12061205
build-macos-aarch64: # job-name skip-x86_64
1207-
runs-on: macos-latest # skip-x86_64
12081206
env: # skip-x86_64
12091207
MACOSX_DEPLOYMENT_TARGET: 11.0 # skip-x86_64
1208+
runs-on: macos-latest
12101209
permissions:
12111210
id-token: write
12121211
contents: read

ci/actions-templates/macos-builds-template.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
jobs: # skip-x86_64 skip-aarch64
2-
32
# This is ci/actions-templates/macos-builds-template.yaml
43
# Do not edit this file in .github/workflows
54
build-macos-aarch64: # job-name skip-x86_64
6-
runs-on: macos-latest # skip-x86_64
75
env: # skip-x86_64
86
MACOSX_DEPLOYMENT_TARGET: 11.0 # skip-x86_64
97
build-macos-x86_64: # job-name skip-aarch64
10-
runs-on: macos-13 # skip-aarch64
118
env: # skip-aarch64
129
MACOSX_DEPLOYMENT_TARGET: 10.12 # skip-aarch64
10+
runs-on: macos-latest
1311
permissions:
1412
id-token: write
1513
contents: read
@@ -79,6 +77,7 @@ jobs: # skip-x86_64 skip-aarch64
7977
- name: Run a full build and test
8078
env:
8179
BUILD_PROFILE: ${{ matrix.mode }}
80+
shell: arch -x86_64 bash -e {0} # skip-aarch64
8281
run: bash ci/run.bash
8382
- name: Dump dynamic link targets
8483
if: matrix.mode == 'release'

0 commit comments

Comments
 (0)