Improve ci & update rust toolchain (Snowfork#858)

* Upgrade rust toolchain * Update readme * Rustup show
yrong · Jun 16, 2023 · 4f91b1a · 4f91b1a
1 parent f48605c
commit 4f91b1a
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 78 deletions.
diff --git a/.github/workflows/parachain.yml b/.github/workflows/parachain.yml
@@ -33,24 +33,15 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('parachain/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-cargo-
-      - name: install protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2023-04-22
-          target: wasm32-unknown-unknown
+      - name: setup rust toolchain
+        run: rustup show
       - name: cargo check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          toolchain: nightly-2023-04-22
-          args: >-
-            --manifest-path parachain/Cargo.toml
-            --workspace
-            --features runtime-benchmarks
+        run: > 
+          cargo check
+          --manifest-path parachain/Cargo.toml
+          --workspace
+          --features runtime-benchmarks
+
   test:
     needs: check
     runs-on: snowbridge-runner
@@ -71,43 +62,34 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('parachain/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-cargo-
-      - uses: arduino/setup-protoc@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2023-04-22
-          target: wasm32-unknown-unknown
+      - name: setup rust toolchain
+        run: rustup show
       # Increase stack limit for beacon light client tests
       - run: sudo prlimit --pid $$ --stack=32768
       # Run tests for everything except the beacon light client
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: >-
-            --manifest-path parachain/Cargo.toml
-            --workspace
-            --features runtime-benchmarks
-            --exclude snowbridge-query-events
-            --exclude snowbridge-ethereum-beacon-client
-          toolchain: nightly-2023-04-22
+      - name: Tests for everything except the beacon light client
+        run: >
+          cargo test
+          --manifest-path parachain/Cargo.toml
+          --workspace 
+          --features runtime-benchmarks 
+          --exclude snowbridge-query-events
+          --exclude snowbridge-ethereum-beacon-client
       # Run tests for beacon light client, excluding benchmark tests
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: >-
-            --manifest-path parachain/Cargo.toml
-            --package snowbridge-ethereum-beacon-client
-          toolchain: nightly-2023-04-22
+      - name: Tests for beacon light client excluding benchmark tests
+        run: >
+          cargo test
+          --manifest-path parachain/Cargo.toml
+          --package snowbridge-ethereum-beacon-client
       # Run benchmark tests for beacon light client
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: >-
-            --manifest-path parachain/Cargo.toml
-            --release
-            --features runtime-benchmarks
-            --package snowbridge-ethereum-beacon-client
-          toolchain: nightly-2023-04-22
+      - name: Benchmark tests for beacon light client
+        run: >
+          cargo test
+          --manifest-path parachain/Cargo.toml
+          --release
+          --features runtime-benchmarks
+          --package snowbridge-ethereum-beacon-client
+
   coverage:
     needs: check
     runs-on: snowbridge-runner
@@ -120,14 +102,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.head_ref }}
-      - uses: arduino/setup-protoc@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2023-04-22
-          target: wasm32-unknown-unknown
-      - run: cargo install cargo-tarpaulin
-      - run: >-
+      - name: setup rust toolchain
+        run: rustup show
+      - name: run coverage test
+        run: >
+          cargo install cargo-tarpaulin &&
           cargo tarpaulin 
           --manifest-path parachain/Cargo.toml
           --workspace
@@ -139,4 +118,22 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           working-directory: parachain
-          files: cobertura.xml
+          files: cobertura.xml
+
+  check-cumulus-bridgehub:
+    runs-on: snowbridge-runner
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
+      - uses: arduino/setup-protoc@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: setup rust toolchain
+        run: rustup show
+      - name: check bridge-hub runtime
+        run: >
+          cargo check 
+          --manifest-path cumulus/Cargo.toml 
+          --release --verbose 
+          --package bridge-hub-rococo-runtime
diff --git a/README.md b/README.md
@@ -64,6 +64,13 @@ cp .envrc.example .envrc
 direnv allow
 ````
 
+## Upgrade
+
+Sometimes we would like to upgrade rust toolchain. First update `parachain/rust-toolchain.toml` as required and then update `flake.lock` running 
+```sh
+nix flake lock --update-input rust-overlay
+```
+
 ## Security
 
 The security policy and procedures can be found in SECURITY.md.
diff --git a/flake.nix b/flake.nix
@@ -18,7 +18,7 @@
             pkgs = import nixpkgs { inherit system overlays; };
             cwd = builtins.toString ./.;
             rust =
-              pkgs.rust-bin.fromRustupToolchainFile "${cwd}/parachain/rust-toolchain.toml";
+              pkgs.rust-bin.fromRustupToolchainFile "${cwd}/rust-toolchain.toml";
         in
         with pkgs;
         {

diff --git a/parachain/rust-toolchain.toml b/parachain/rust-toolchain.toml
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,10 @@
+[toolchain]
+channel = "1.69.0"
+components = [
+    "clippy",
+    "rust-analyzer",
+    "rust-src",
+    "rustfmt",
+]
+targets = ["wasm32-unknown-unknown"]
+profile = "minimal"