Merge branch 'main' into pov_compatible_schemas

frequency-chain · Oct 25, 2023 · 2130b16 · 2130b16
2 parents f2c3a2a + 3c9488a
commit 2130b16
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -348,7 +348,7 @@ jobs:
         uses: actions/configure-pages@v3
       - name: Build Docs
         run: |
-          rustup target add wasm32-unknown-unknown
+          rustup target add wasm32-unknown-unknown --toolchain nightly-2023-07-13
           RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo +nightly-2023-07-13 doc --no-deps --workspace --features frequency
       - name: Fix file permissions
         shell: sh

diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
@@ -199,10 +199,7 @@ jobs:
       - name: Check Out Repo
         uses: actions/checkout@v4
       - name: Check
-        # Remove these install commands when ci-base-image has nightly toolchain
         run: |
-          rustup toolchain install nightly-2023-07-13
-          rustup target add x86_64-unknown-linux-gnu --toolchain nightly-2023-07-13
           cargo +nightly-2023-07-13 fmt --check
 
   lint-rust-code:
@@ -215,10 +212,7 @@ jobs:
       - name: Check Out Repo
         uses: actions/checkout@v4
       - name: Lint
-        # Remove these install commands when ci-base-image has nightly toolchain
         run: |
-          rustup toolchain install nightly-2023-07-13
-          rustup target add x86_64-unknown-linux-gnu --toolchain nightly-2023-07-13
           SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly-2023-07-13 clippy \
             --features runtime-benchmarks,frequency-lint-check \
             -- \
@@ -234,9 +228,7 @@ jobs:
       - name: Check Out Repo
         uses: actions/checkout@v4
       - name: Build Docs
-        # Remove these install commands when ci-base-image has nightly toolchain
         run: |
-          rustup toolchain install nightly-2023-07-13
           rustup target add wasm32-unknown-unknown --toolchain nightly-2023-07-13
           RUSTDOCFLAGS="--enable-index-page --check -Zunstable-options" cargo +nightly-2023-07-13 doc --no-deps --features frequency