From ab3926348c9da68eee8c55861798ee267e92979b Mon Sep 17 00:00:00 2001 From: JC Date: Sat, 15 Oct 2022 00:00:01 +0300 Subject: [PATCH 1/2] Add `rust-toolchain` file --- .github/workflows/ci.yml | 23 +---------------------- .github/workflows/gh-pages.yml | 1 - rust-toolchain | 1 + 3 files changed, 2 insertions(+), 23 deletions(-) create mode 100644 rust-toolchain diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0a7377642b..3378cfff9b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Install Forc uses: actions-rs/cargo@v1 @@ -41,7 +40,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Install Forc uses: actions-rs/cargo@v1 @@ -58,7 +56,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Install Forc uses: actions-rs/cargo@v1 @@ -83,7 +80,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Install Forc uses: actions-rs/cargo@v1 @@ -108,7 +104,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Install Forc uses: actions-rs/cargo@v1 @@ -147,7 +142,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Install Forc uses: actions-rs/cargo@v1 @@ -185,7 +179,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - uses: actions-rs/cargo@v1 name: Cargo Build Workspace @@ -200,8 +193,6 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Check Clippy Linter uses: actions-rs/cargo@v1 @@ -214,8 +205,6 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - name: Install Cargo.toml linter uses: baptiste0928/cargo-install@v1 with: @@ -229,8 +218,6 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - name: Check Formatting uses: actions-rs/cargo@v1 with: @@ -249,7 +236,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Cargo Run E2E Tests uses: actions-rs/cargo@v1 @@ -265,7 +251,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Build All Tests run: cd test/src/sdk-harness && bash build.sh --locked && cd ../../../ @@ -282,7 +267,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - uses: Swatinem/rust-cache@v1 - name: Run tests uses: actions-rs/cargo@v1 @@ -298,7 +282,7 @@ jobs: with: # `cargo-udeps` requires nightly to run toolchain: nightly - default: true + override: true - uses: Swatinem/rust-cache@v1 - name: Install cargo-udeps uses: actions-rs/cargo@v1 @@ -366,9 +350,6 @@ jobs: - name: Install toolchain uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Verify tag version run: | @@ -577,9 +558,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable target: ${{ matrix.job.target }} - override: true - uses: Swatinem/rust-cache@v1 with: diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 083c8c61373..f679cc2c3aa 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -17,7 +17,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - name: Install Forc uses: actions-rs/cargo@v1 with: diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 00000000000..2bf5ad0447d --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +stable From 39472acc17fb569ccb2c367cbab8a2fe96028c5e Mon Sep 17 00:00:00 2001 From: JC Date: Tue, 15 Nov 2022 16:34:25 -0500 Subject: [PATCH 2/2] Pin to 1.65.0 --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 2bf5ad0447d..902c74186fb 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -stable +1.65.0