merged main into branch

frequency-chain · Oct 20, 2023 · 450d889 · 450d889
2 parents 9e9fafd + b12638d
commit 450d889
Show file tree

Hide file tree

Showing 112 changed files with 3,225 additions and 3,250 deletions.
diff --git a/.github/workflows/check-polkadot-releases.yml b/.github/workflows/check-polkadot-releases.yml
@@ -31,7 +31,7 @@ jobs:
           cat ${{env.RELEASE_TRACK_FILENAME}}
       - name: Commit Latest Release Version
         id: commit-updated-weights
-        uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
+        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
         with:
           commit_message: "Record new Polkadot release version"
           commit_user_name: Frequency CI [bot]

diff --git a/.github/workflows/publish-dev-ci-base-image.yml b/.github/workflows/publish-dev-ci-base-image.yml
@@ -7,7 +7,7 @@ on:
   push:
     branches:
       - disabled-as-this-branch-does-not-exist
-      # - 1482-add-rust-toolchain-install-to-ci-base-image
+      # - 1639-upgrade-to-polkadot-release-v100
 env:
   BIN_DIR: target/release
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ env:
   RELEASE_BRANCH_NAME: release-${{github.event.inputs.release-version || github.ref_name}}
   LATEST_FULL_RELEASE_TAG: _LATEST-FULL-RELEASE
   TEST_RUN: ${{startsWith(github.event.inputs.release-version || github.ref_name, 'v0.0.1')}}
-  RUST_TOOLCHAIN: "nightly-2023-05-22" # Match to /rust-toolchain.toml
+  RUST_TOOLCHAIN: "1.70.0" # Match to /rust-toolchain.toml
 
 jobs:
   validate-release-version:
@@ -104,7 +104,7 @@ jobs:
           git diff
       - name: Commit Updated Weights
         if: steps.is-full-release.outputs.is-full-release == 'true'
-        uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
+        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
         with:
           commit_message: "Update weights for release ${{env.NEW_RELEASE_TAG}}"
           commit_user_name: Frequency CI [bot]
@@ -133,7 +133,7 @@ jobs:
           git diff
       - name: Commit Updated Version
         id: commit-updated-version
-        uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
+        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
         with:
           commit_message: "Update versions for release ${{env.NEW_RELEASE_TAG}}"
           commit_user_name: Frequency CI [bot]
@@ -310,7 +310,7 @@ jobs:
           srtool --version
       - name: Build Deterministic WASM
         run: |
-          RUST_LOG=debug SRTOOL_TAG="1.66.1" srtool build \
+          RUST_LOG=debug SRTOOL_TAG="1.70.0" srtool build \
             --build-opts="'--features on-chain-release-build,no-metadata-docs,${{matrix.features}}'" \
             --profile=${{matrix.build-profile}} \
             --package=${{matrix.package}}
@@ -349,7 +349,7 @@ jobs:
       - name: Build Docs
         run: |
           rustup target add wasm32-unknown-unknown
-          RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --no-deps --workspace --features frequency
+          RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo +nightly-2023-07-13 doc --no-deps --workspace --features frequency
       - name: Fix file permissions
         shell: sh
         run: |

diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
@@ -199,7 +199,11 @@ jobs:
       - name: Check Out Repo
         uses: actions/checkout@v4
       - name: Check
-        run: cargo fmt --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:
     needs: changes
@@ -211,8 +215,11 @@ jobs:
       - name: Check Out Repo
         uses: actions/checkout@v4
       - name: Lint
+        # Remove these install commands when ci-base-image has nightly toolchain
         run: |
-          SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo clippy \
+          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 \
             -- \
             -D warnings
@@ -227,9 +234,11 @@ 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 target add wasm32-unknown-unknown
-          RUSTDOCFLAGS="--enable-index-page --check -Zunstable-options" cargo doc --no-deps --features frequency
+          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
 
   verify-rust-packages-and-deps:
     needs: changes
@@ -367,7 +376,7 @@ jobs:
       - name: Build Deterministic WASM
         if: steps.cache-wasm.outputs.cache-hit != 'true'
         run: |
-          RUST_LOG=debug SRTOOL_TAG="1.66.1" srtool build \
+          RUST_LOG=debug SRTOOL_TAG="1.70.0" srtool build \
             --build-opts="'--features on-chain-release-build,no-metadata-docs,${{matrix.features}}'" \
             --profile=${{matrix.build-profile}} \
             --package=${{matrix.package}}
@@ -673,7 +682,6 @@ jobs:
             --dev \
             --sealing=instant \
             --wasm-execution=compiled \
-            --execution=wasm \
             --no-telemetry \
             --no-prometheus \
             --port $((30333)) \
@@ -845,7 +853,7 @@ jobs:
           git diff
       - name: Commit Updated Weights
         id: commit-updated-weights
-        uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
+        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
         with:
           commit_message: "Update weights for PR #${{github.event.pull_request.number}}"
           commit_user_name: Frequency CI [bot]

diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
-rust 1.69
+rust 1.70
 make 4.3
 cmake 3.24.1