From 4e3d94d532a9cd61b995a972eb2a1fe0284ecb43 Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 13:11:12 +0100 Subject: [PATCH] Update to dtolnay/rust-toolchain --- .github/workflows/fuzz-nightly.yml | 4 +-- .../pull-request-account-compression.yml | 4 +-- .../pull-request-binary-oracle-pair.yml | 4 +-- .github/workflows/pull-request-examples.yml | 4 +-- .../workflows/pull-request-feature-gate.yml | 4 +-- .../pull-request-feature-proposal.yml | 4 +-- .github/workflows/pull-request-governance.yml | 4 +-- .../pull-request-instruction-padding.yml | 4 +-- .github/workflows/pull-request-libraries.yml | 4 +-- .github/workflows/pull-request-memo.yml | 4 +-- .../workflows/pull-request-name-service.yml | 4 +-- .github/workflows/pull-request-record.yml | 4 +-- .../workflows/pull-request-shared-memory.yml | 4 +-- .../workflows/pull-request-single-pool.yml | 8 ++---- .github/workflows/pull-request-stake-pool.yml | 4 +-- .../pull-request-token-collection.yml | 4 +-- .../workflows/pull-request-token-group.yml | 4 +-- .../workflows/pull-request-token-lending.yml | 4 +-- .../workflows/pull-request-token-metadata.yml | 4 +-- .github/workflows/pull-request-token-swap.yml | 8 ++---- .../workflows/pull-request-token-upgrade.yml | 8 ++---- .github/workflows/pull-request-token.yml | 28 +++++-------------- .github/workflows/pull-request.yml | 16 +++-------- 23 files changed, 35 insertions(+), 105 deletions(-) diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml index b0bf7424249..639c58b0407 100644 --- a/.github/workflows/fuzz-nightly.yml +++ b/.github/workflows/fuzz-nightly.yml @@ -21,11 +21,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml index 48c3f37a96d..90c4fd5cf41 100644 --- a/.github/workflows/pull-request-account-compression.yml +++ b/.github/workflows/pull-request-account-compression.yml @@ -32,11 +32,9 @@ jobs: source ci/install-anchor.sh echo "ANCHOR_CLI_VERSION=$anchor_cli_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-binary-oracle-pair.yml b/.github/workflows/pull-request-binary-oracle-pair.yml index b4edb6cc0ab..6c8e4e32bbd 100644 --- a/.github/workflows/pull-request-binary-oracle-pair.yml +++ b/.github/workflows/pull-request-binary-oracle-pair.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-examples.yml b/.github/workflows/pull-request-examples.yml index ec7403c2ef3..24958642145 100644 --- a/.github/workflows/pull-request-examples.yml +++ b/.github/workflows/pull-request-examples.yml @@ -24,11 +24,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-feature-gate.yml b/.github/workflows/pull-request-feature-gate.yml index 003680e1106..8ee4a04f9e1 100644 --- a/.github/workflows/pull-request-feature-gate.yml +++ b/.github/workflows/pull-request-feature-gate.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-feature-proposal.yml b/.github/workflows/pull-request-feature-proposal.yml index a465d39ae83..438bc96b0fe 100644 --- a/.github/workflows/pull-request-feature-proposal.yml +++ b/.github/workflows/pull-request-feature-proposal.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-governance.yml b/.github/workflows/pull-request-governance.yml index a137fc3f731..709c3aba91c 100644 --- a/.github/workflows/pull-request-governance.yml +++ b/.github/workflows/pull-request-governance.yml @@ -36,11 +36,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-instruction-padding.yml b/.github/workflows/pull-request-instruction-padding.yml index 26de8896bdc..0e20f66c7bf 100644 --- a/.github/workflows/pull-request-instruction-padding.yml +++ b/.github/workflows/pull-request-instruction-padding.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-libraries.yml b/.github/workflows/pull-request-libraries.yml index cdc52217161..d6758f858d5 100644 --- a/.github/workflows/pull-request-libraries.yml +++ b/.github/workflows/pull-request-libraries.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-memo.yml b/.github/workflows/pull-request-memo.yml index 49d5700c177..2c49cd6dc0f 100644 --- a/.github/workflows/pull-request-memo.yml +++ b/.github/workflows/pull-request-memo.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-name-service.yml b/.github/workflows/pull-request-name-service.yml index 34f779db616..4880f934933 100644 --- a/.github/workflows/pull-request-name-service.yml +++ b/.github/workflows/pull-request-name-service.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-record.yml b/.github/workflows/pull-request-record.yml index 47336d4be28..b8cd078fdeb 100644 --- a/.github/workflows/pull-request-record.yml +++ b/.github/workflows/pull-request-record.yml @@ -24,11 +24,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-shared-memory.yml b/.github/workflows/pull-request-shared-memory.yml index 9d3408b041b..5bedc3ea52f 100644 --- a/.github/workflows/pull-request-shared-memory.yml +++ b/.github/workflows/pull-request-shared-memory.yml @@ -24,11 +24,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-single-pool.yml b/.github/workflows/pull-request-single-pool.yml index 2dc5798e4d2..424bcfb9289 100644 --- a/.github/workflows/pull-request-single-pool.yml +++ b/.github/workflows/pull-request-single-pool.yml @@ -32,11 +32,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -84,11 +82,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-stake-pool.yml b/.github/workflows/pull-request-stake-pool.yml index acb7d2bb30a..b6cd624fc19 100644 --- a/.github/workflows/pull-request-stake-pool.yml +++ b/.github/workflows/pull-request-stake-pool.yml @@ -41,11 +41,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-collection.yml b/.github/workflows/pull-request-token-collection.yml index 14ab6599dfd..9f10bc8c150 100644 --- a/.github/workflows/pull-request-token-collection.yml +++ b/.github/workflows/pull-request-token-collection.yml @@ -32,11 +32,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-group.yml b/.github/workflows/pull-request-token-group.yml index 5c7c60abb6e..990b93050de 100644 --- a/.github/workflows/pull-request-token-group.yml +++ b/.github/workflows/pull-request-token-group.yml @@ -28,11 +28,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-lending.yml b/.github/workflows/pull-request-token-lending.yml index 40861bcd715..b2fe6a32563 100644 --- a/.github/workflows/pull-request-token-lending.yml +++ b/.github/workflows/pull-request-token-lending.yml @@ -28,11 +28,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-metadata.yml b/.github/workflows/pull-request-token-metadata.yml index f1a0382609a..d3937329b07 100644 --- a/.github/workflows/pull-request-token-metadata.yml +++ b/.github/workflows/pull-request-token-metadata.yml @@ -30,11 +30,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-swap.yml b/.github/workflows/pull-request-token-swap.yml index 3b375ac02f3..df1a2d63d66 100644 --- a/.github/workflows/pull-request-token-swap.yml +++ b/.github/workflows/pull-request-token-swap.yml @@ -30,11 +30,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -116,11 +114,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-upgrade.yml b/.github/workflows/pull-request-token-upgrade.yml index e4c81960789..3af9ca8274d 100644 --- a/.github/workflows/pull-request-token-upgrade.yml +++ b/.github/workflows/pull-request-token-upgrade.yml @@ -28,11 +28,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -73,11 +71,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml index 53eda7d66ce..ae212b9fda7 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -33,11 +33,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -85,11 +83,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -117,11 +113,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -169,11 +163,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -225,11 +217,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE_VERSION }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -284,11 +274,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -326,11 +314,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index aa89c25c622..135ed758813 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -30,11 +30,9 @@ jobs: source ci/rust-version.sh echo "RUST_NIGHTLY=$rust_nightly" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_NIGHTLY }} - override: true - profile: minimal components: rustfmt - name: Run fmt @@ -53,11 +51,9 @@ jobs: source ci/rust-version.sh echo "RUST_NIGHTLY=$rust_nightly" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_NIGHTLY }} - override: true - profile: minimal components: clippy - uses: actions/cache@v3 @@ -89,11 +85,9 @@ jobs: source ci/rust-version.sh echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - name: Install Cargo Audit uses: actions-rs/install@v0.1 @@ -119,11 +113,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: