Merge pull request #377 from HEnquist/updated_macos_runners

Update for new macos runners
HEnquist · Nov 10, 2024 · 8135e5e · 8135e5e
2 parents 1f510c5 + f6d4b94
commit 8135e5e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml
@@ -159,8 +159,8 @@ jobs:
         run: cargo test --no-default-features
 
   check_test_macos:
-    name: Check and test macOS
-    runs-on: macos-latest
+    name: Check and test macOS Intel
+    runs-on: macos-13
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -175,19 +175,20 @@ jobs:
         run: cargo test --no-default-features
 
   check_macos_arm:
-    name: Check macOS aarch64
+    name: Check and test macOS Arm
     runs-on: macos-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: aarch64-apple-darwin
 
-      - name: Run cargo check for arm
-        run: cargo check --target aarch64-apple-darwin
+      - name: Run cargo check
+        run: cargo check --no-default-features
+
+      - name: Run cargo test
+        run: cargo test --no-default-features
 
 
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -192,8 +192,8 @@ jobs:
           asset_name: camilladsp-windows7-amd64.zip
           tag: ${{ github.ref }}
   macos:
-    name: macOS
-    runs-on: macos-latest
+    name: macOS Intel
+    runs-on: macos-13
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -217,22 +217,20 @@ jobs:
 
 
   macos_arm:
-    name: macOS aarch64
+    name: macOS Arm
     runs-on: macos-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: aarch64-apple-darwin
 
       - name: Build
-        run: cargo build --release --target aarch64-apple-darwin
+        run: cargo build --release
 
       - name: Compress
-        run: tar -zcvf camilladsp.tar.gz -C target/aarch64-apple-darwin/release camilladsp
+        run: tar -zcvf camilladsp.tar.gz -C target/release camilladsp
 
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2