Skip to content

Commit

Permalink
CI: Avoid actions-rs/toolchain when we only need to use stable Rust.
Browse files Browse the repository at this point in the history
GitHub Actions runners already have rustup with the stable toolchain
installed, apparently. actions-rs is going away and we don't want to
keep maintaining a fork with an unsupported upstream, so start the
process of dropping it.
  • Loading branch information
briansmith committed Nov 30, 2023
1 parent dc035d9 commit b349cec
Showing 1 changed file with 9 additions and 41 deletions.
50 changes: 9 additions & 41 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: briansmith/actions-rs-toolchain@v1
with:
toolchain: stable
profile: minimal
components: rustfmt
- run: rustup --version

- uses: briansmith/actions-checkout@v2
with:
persist-credentials: false

- run: cargo fmt --all -- --check

clippy:
Expand All @@ -29,11 +27,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: briansmith/actions-rs-toolchain@v1
with:
toolchain: stable
profile: minimal
components: clippy
- run: rustup --version

- uses: briansmith/actions-checkout@v2
with:
Expand All @@ -48,10 +42,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: briansmith/actions-rs-toolchain@v1
with:
toolchain: stable
profile: minimal
- run: rustup --version

- uses: briansmith/actions-cache@v2
with:
Expand Down Expand Up @@ -79,10 +70,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: briansmith/actions-rs-toolchain@v1
with:
toolchain: stable
profile: minimal
- run: rustup --version

- uses: briansmith/actions-cache@v2
with:
Expand All @@ -107,22 +95,8 @@ jobs:

runs-on: ubuntu-22.04

strategy:
matrix:
rust_channel:
- stable
- beta
- nightly

include:
- target: x86_64-unknown-linux-gnu

steps:
- uses: briansmith/actions-rs-toolchain@v1
with:
override: true
target: ${{ matrix.target }}
toolchain: ${{ matrix.rust_channel }}
- run: rustup --version

- uses: briansmith/actions-checkout@v2
with:
Expand All @@ -144,10 +118,7 @@ jobs:

- run: ./mk/install-build-tools.ps1

- uses: briansmith/actions-rs-toolchain@v1
with:
toolchain: stable
profile: minimal
- run: rustup --version

- run: echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin" >> $GITHUB_PATH
shell: bash
Expand Down Expand Up @@ -340,10 +311,7 @@ jobs:

- run: mk/install-build-tools.sh --target=x86_64-unknown-linux-gnu

- uses: briansmith/actions-rs-toolchain@v1
with:
override: true
toolchain: stable
- run: rustup --version

- run: cargo test -p ring-bench --all-features --all-targets

Expand Down

0 comments on commit b349cec

Please sign in to comment.