Skip to content

Commit 81c299c

Browse files
committed
fixup! ci(macos): run x64 workflows with Rosetta 2
1 parent 3b90948 commit 81c299c

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,9 +1073,6 @@ jobs:
10731073
build-macos-x86_64: # job-name skip-aarch64
10741074
env: # skip-aarch64
10751075
MACOSX_DEPLOYMENT_TARGET: 10.12 # skip-aarch64
1076-
defaults: # skip-aarch64
1077-
run: # skip-aarch64
1078-
shell: arch -x86_64 bash -e {0} # skip-aarch64
10791076
runs-on: macos-latest
10801077
permissions:
10811078
id-token: write
@@ -1145,6 +1142,7 @@ jobs:
11451142
- name: Run a full build and test
11461143
env:
11471144
BUILD_PROFILE: ${{ matrix.mode }}
1145+
shell: arch -x86_64 bash -e {0} # skip-aarch64
11481146
run: bash ci/run.bash
11491147
- name: Dump dynamic link targets
11501148
if: matrix.mode == 'release'

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ jobs: # skip-x86_64 skip-aarch64
77
build-macos-x86_64: # job-name skip-aarch64
88
env: # skip-aarch64
99
MACOSX_DEPLOYMENT_TARGET: 10.12 # skip-aarch64
10-
defaults: # skip-aarch64
11-
run: # skip-aarch64
12-
shell: arch -x86_64 bash -e {0} # skip-aarch64
1310
runs-on: macos-latest
1411
permissions:
1512
id-token: write
@@ -80,6 +77,7 @@ jobs: # skip-x86_64 skip-aarch64
8077
- name: Run a full build and test
8178
env:
8279
BUILD_PROFILE: ${{ matrix.mode }}
80+
shell: arch -x86_64 bash -e {0} # skip-aarch64
8381
run: bash ci/run.bash
8482
- name: Dump dynamic link targets
8583
if: matrix.mode == 'release'

0 commit comments

Comments
 (0)