Fix CI build

GitHub workers have changed slightly and actions-rs/toolchain is no longer needed.
zkxs · Sep 16, 2024 · bd46cf7 · bd46cf7
1 parent 923d880
commit bd46cf7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,14 +47,14 @@ jobs:
             artifact-suffix: -mac-x86
             suffix: ''
             path-separator: '/'
-            runner-can-execute: true
+            runner-can-execute: false
           - runs-on: macos-latest
             triple: aarch64-apple-darwin
             build-name: macOS ARM
             artifact-suffix: -mac-arm
             suffix: ''
             path-separator: '/'
-            runner-can-execute: false
+            runner-can-execute: true
       fail-fast: false
     name: Build ${{ matrix.target.build-name }}
     runs-on: ${{ matrix.target.runs-on }}
@@ -71,19 +71,8 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - name: Setup Rust stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          target: ${{ matrix.target.triple }}
       - name: Setup Rust nightly toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          components: rust-src
-          target: ${{ matrix.target.triple }}
+        run: rustup toolchain install --profile minimal --target ${{ matrix.target.triple }} --component rust-src --component clippy nightly
       - name: Check
         run: cargo +nightly clippy --all-features --target ${{ matrix.target.triple }}
       - name: Check benches

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,14 +46,14 @@ jobs:
             artifact-suffix: -mac-x86
             suffix: ''
             path-separator: '/'
-            runner-can-execute: true
+            runner-can-execute: false
           - runs-on: macos-latest
             triple: aarch64-apple-darwin
             build-name: macOS ARM
             artifact-suffix: -mac-arm
             suffix: ''
             path-separator: '/'
-            runner-can-execute: false
+            runner-can-execute: true
       fail-fast: false
     name: Test ${{ matrix.target.build-name }}
     runs-on: ${{ matrix.target.runs-on }}
@@ -71,18 +71,14 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          target: ${{ matrix.target.triple }}
+        run: rustup target add ${{ matrix.target.triple }}
       - name: Check
-        run: cargo +nightly clippy --all-features --target ${{ matrix.target.triple }}
+        run: cargo clippy --all-features --target ${{ matrix.target.triple }}
       - name: Check benches
-        run: cargo +nightly clippy --benches --no-default-features --features bench --target ${{ matrix.target.triple }}
+        run: cargo clippy --benches --no-default-features --features bench --target ${{ matrix.target.triple }}
       - name: Test (no features)
         if: matrix.target.runner-can-execute
-        run: cargo +nightly test --no-default-features --target ${{ matrix.target.triple }}
+        run: cargo test --no-default-features --target ${{ matrix.target.triple }}
       - name: Test (all features)
         if: matrix.target.runner-can-execute
-        run: cargo +nightly test --all-features --target ${{ matrix.target.triple }}
+        run: cargo test --all-features --target ${{ matrix.target.triple }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,10 +25,6 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
       - name: Publish line_cardinality
         run: cargo publish --package line_cardinality --all-features
         env: