From 4f000f324b1271a406c6bbbf15f7872206de1bc0 Mon Sep 17 00:00:00 2001 From: Ron Kuris Date: Thu, 7 Sep 2023 20:27:43 +0000 Subject: [PATCH] actions-rs/toolchain -> dtolnay/rust-toolchain The former generates tons of warnings runs on deprecated subcomponents and appears to be unmaintained. References: * https://www.reddit.com/r/rust/comments/vyx4oj/actionsrs_organization_became_unmaintained/ * https://github.com/actions-rs/toolchain/issues/216 * https://github.com/actions-rs/toolchain/pull/220 * https://github.com/rust-lang/hashbrown/pull/467 (and many others doing this) --- .github/workflows/ci.yaml | 25 +++++---------------- .github/workflows/default-branch-cache.yaml | 5 +---- .github/workflows/gh-pages.yaml | 5 +---- .github/workflows/publish.yaml | 5 +---- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f2df4bbb7..9996c9312 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,10 +15,7 @@ jobs: cache-key: ${{ steps.cargo-cache.outputs.cache-primary-key }} steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: arduino/setup-protoc@v2 # caution: this is the same restore as in gh-pages.yaml - name: Restore Cargo Cache @@ -80,10 +77,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable components: rustfmt, clippy - uses: arduino/setup-protoc@v2 - name: Restore Check Deps @@ -108,10 +102,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: arduino/setup-protoc@v2 - name: Restore Check Deps id: cache-build-deps-restore @@ -132,10 +123,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: arduino/setup-protoc@v2 - name: Restore Check Deps id: cache-build-deps-restore @@ -159,10 +147,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: arduino/setup-protoc@v2 - name: Restore Check Deps id: cache-build-deps-restore diff --git a/.github/workflows/default-branch-cache.yaml b/.github/workflows/default-branch-cache.yaml index 2afa44b4c..7e18c7f2e 100644 --- a/.github/workflows/default-branch-cache.yaml +++ b/.github/workflows/default-branch-cache.yaml @@ -15,10 +15,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: arduino/setup-protoc@v2 - name: Restore Cargo Cache id: cargo-cache diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml index b855098d9..416db804d 100644 --- a/.github/workflows/gh-pages.yaml +++ b/.github/workflows/gh-pages.yaml @@ -13,10 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: arduino/setup-protoc@v2 # caution: this is the same restore as in ci.yaml - name: Restore Cargo Cache diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 27e4d7afd..89171dcd4 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -12,10 +12,7 @@ jobs: if: "startsWith(github.event.release.tag_name, 'v')" steps: - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - name: publish shale crate continue-on-error: true run: |