Skip to content

Commit 8135e5e

Browse files
authored
Merge pull request #377 from HEnquist/updated_macos_runners
Update for new macos runners
2 parents 1f510c5 + f6d4b94 commit 8135e5e

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

.github/workflows/ci_test.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ jobs:
159159
run: cargo test --no-default-features
160160

161161
check_test_macos:
162-
name: Check and test macOS
163-
runs-on: macos-latest
162+
name: Check and test macOS Intel
163+
runs-on: macos-13
164164
steps:
165165
- name: Checkout sources
166166
uses: actions/checkout@v4
@@ -175,19 +175,20 @@ jobs:
175175
run: cargo test --no-default-features
176176

177177
check_macos_arm:
178-
name: Check macOS aarch64
178+
name: Check and test macOS Arm
179179
runs-on: macos-latest
180180
steps:
181181
- name: Checkout sources
182182
uses: actions/checkout@v4
183183

184184
- name: Install stable toolchain
185185
uses: dtolnay/rust-toolchain@stable
186-
with:
187-
targets: aarch64-apple-darwin
188186

189-
- name: Run cargo check for arm
190-
run: cargo check --target aarch64-apple-darwin
187+
- name: Run cargo check
188+
run: cargo check --no-default-features
189+
190+
- name: Run cargo test
191+
run: cargo test --no-default-features
191192

192193

193194

.github/workflows/publish.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ jobs:
192192
asset_name: camilladsp-windows7-amd64.zip
193193
tag: ${{ github.ref }}
194194
macos:
195-
name: macOS
196-
runs-on: macos-latest
195+
name: macOS Intel
196+
runs-on: macos-13
197197
steps:
198198
- name: Checkout sources
199199
uses: actions/checkout@v4
@@ -217,22 +217,20 @@ jobs:
217217

218218

219219
macos_arm:
220-
name: macOS aarch64
220+
name: macOS Arm
221221
runs-on: macos-latest
222222
steps:
223223
- name: Checkout sources
224224
uses: actions/checkout@v4
225225

226226
- name: Install stable toolchain
227227
uses: dtolnay/rust-toolchain@stable
228-
with:
229-
targets: aarch64-apple-darwin
230228

231229
- name: Build
232-
run: cargo build --release --target aarch64-apple-darwin
230+
run: cargo build --release
233231

234232
- name: Compress
235-
run: tar -zcvf camilladsp.tar.gz -C target/aarch64-apple-darwin/release camilladsp
233+
run: tar -zcvf camilladsp.tar.gz -C target/release camilladsp
236234

237235
- name: Upload binaries to release
238236
uses: svenstaro/upload-release-action@v2

0 commit comments

Comments
 (0)