CI: Avoid actions-rs/toolchain when we only need to use stable Rust.
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.
This commit is contained in:
parent
dc035d9fc3
commit
b349cecd06
50
.github/workflows/ci.yml
vendored
50
.github/workflows/ci.yml
vendored
@ -12,14 +12,12 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: briansmith/actions-rs-toolchain@v1
|
- run: rustup --version
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
profile: minimal
|
|
||||||
components: rustfmt
|
|
||||||
- uses: briansmith/actions-checkout@v2
|
- uses: briansmith/actions-checkout@v2
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- run: cargo fmt --all -- --check
|
- run: cargo fmt --all -- --check
|
||||||
|
|
||||||
clippy:
|
clippy:
|
||||||
@ -29,11 +27,7 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: briansmith/actions-rs-toolchain@v1
|
- run: rustup --version
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
profile: minimal
|
|
||||||
components: clippy
|
|
||||||
|
|
||||||
- uses: briansmith/actions-checkout@v2
|
- uses: briansmith/actions-checkout@v2
|
||||||
with:
|
with:
|
||||||
@ -48,10 +42,7 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: briansmith/actions-rs-toolchain@v1
|
- run: rustup --version
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
profile: minimal
|
|
||||||
|
|
||||||
- uses: briansmith/actions-cache@v2
|
- uses: briansmith/actions-cache@v2
|
||||||
with:
|
with:
|
||||||
@ -79,10 +70,7 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: briansmith/actions-rs-toolchain@v1
|
- run: rustup --version
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
profile: minimal
|
|
||||||
|
|
||||||
- uses: briansmith/actions-cache@v2
|
- uses: briansmith/actions-cache@v2
|
||||||
with:
|
with:
|
||||||
@ -107,22 +95,8 @@ jobs:
|
|||||||
|
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
rust_channel:
|
|
||||||
- stable
|
|
||||||
- beta
|
|
||||||
- nightly
|
|
||||||
|
|
||||||
include:
|
|
||||||
- target: x86_64-unknown-linux-gnu
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: briansmith/actions-rs-toolchain@v1
|
- run: rustup --version
|
||||||
with:
|
|
||||||
override: true
|
|
||||||
target: ${{ matrix.target }}
|
|
||||||
toolchain: ${{ matrix.rust_channel }}
|
|
||||||
|
|
||||||
- uses: briansmith/actions-checkout@v2
|
- uses: briansmith/actions-checkout@v2
|
||||||
with:
|
with:
|
||||||
@ -144,10 +118,7 @@ jobs:
|
|||||||
|
|
||||||
- run: ./mk/install-build-tools.ps1
|
- run: ./mk/install-build-tools.ps1
|
||||||
|
|
||||||
- uses: briansmith/actions-rs-toolchain@v1
|
- run: rustup --version
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
profile: minimal
|
|
||||||
|
|
||||||
- run: echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin" >> $GITHUB_PATH
|
- run: echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin" >> $GITHUB_PATH
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -340,10 +311,7 @@ jobs:
|
|||||||
|
|
||||||
- run: mk/install-build-tools.sh --target=x86_64-unknown-linux-gnu
|
- run: mk/install-build-tools.sh --target=x86_64-unknown-linux-gnu
|
||||||
|
|
||||||
- uses: briansmith/actions-rs-toolchain@v1
|
- run: rustup --version
|
||||||
with:
|
|
||||||
override: true
|
|
||||||
toolchain: stable
|
|
||||||
|
|
||||||
- run: cargo test -p ring-bench --all-features --all-targets
|
- run: cargo test -p ring-bench --all-features --all-targets
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user