Skip to content

Commit 836eccb

Browse files
committed
ci: Run macos builds on M1
Signed-off-by: Lann Martin <[email protected]>
1 parent ad8e68a commit 836eccb

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
runs-on: ${{ matrix.os }}
117117
strategy:
118118
matrix:
119-
os: [windows-latest, macos-latest]
119+
os: [windows-latest, macos-14]
120120
steps:
121121
- uses: actions/checkout@v3
122122

@@ -145,7 +145,7 @@ jobs:
145145
runs-on: ${{ matrix.runner }}
146146
strategy:
147147
matrix:
148-
runner: [ubuntu-22.04-4core-spin, macos-latest]
148+
runner: [ubuntu-22.04-4core-spin, macos-14]
149149
steps:
150150
- uses: actions/checkout@v3
151151

@@ -165,7 +165,7 @@ jobs:
165165
run: |
166166
make test-integration
167167
# Only run integration tests on macOS as they will be run on ubuntu separately
168-
if: ${{ matrix.runner == 'macos-latest' }}
168+
if: ${{ matrix.runner == 'macos-14' }}
169169

170170
all-integration-tests:
171171
# run on a larger runner for more SSD/resource access
@@ -228,21 +228,13 @@ jobs:
228228
targetDir: "target/aarch64-unknown-linux-gnu/release",
229229
}
230230
- {
231-
os: "macos-latest",
232-
arch: "amd64",
231+
os: "macos-14",
232+
arch: "aarch64",
233233
extension: "",
234234
extraArgs: "",
235235
target: "",
236236
targetDir: "target/release",
237237
}
238-
- {
239-
os: "macos-latest",
240-
arch: "aarch64",
241-
extension: "",
242-
extraArgs: "--target aarch64-apple-darwin",
243-
target: "aarch64-apple-darwin",
244-
targetDir: "target/aarch64-apple-darwin/release/",
245-
}
246238
- {
247239
os: "windows-latest",
248240
arch: "amd64",

.github/workflows/release.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,12 @@ jobs:
4444
targetDir: "target/aarch64-unknown-linux-gnu/release",
4545
}
4646
- {
47-
os: "macos-latest",
48-
arch: "amd64",
47+
os: "macos-14",
48+
arch: "aarch64",
4949
extension: "",
5050
extraArgs: "",
5151
target: "",
52-
targetDir: "target/release",
53-
}
54-
- {
55-
os: "macos-latest",
56-
arch: "aarch64",
57-
extension: "",
58-
extraArgs: "--target aarch64-apple-darwin",
59-
target: "aarch64-apple-darwin",
60-
targetDir: "target/aarch64-apple-darwin/release/",
52+
targetDir: "target/release/",
6153
}
6254
- {
6355
os: "windows-latest",

0 commit comments

Comments
 (0)