Merge branch 'master' into release-v0.5

pontem-network · Feb 10, 2022 · fa3a843 · fa3a843
2 parents cb434e3 + 3478d81
commit fa3a843
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 59 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -26,7 +26,9 @@ jobs:
       matrix:
         cfg:
           - os: self-hosted
-            grcov: grcov-linux-x86_64.tar.bz2
+            grcov:
+              version: tags/v0.8.6
+              file: grcov-v0.8.6-x86_64-unknown-linux-gnu.tar.gz
             dove: 1.5.5
 
     env:
@@ -40,7 +42,8 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        # uses: actions-rs/toolchain@v1
+        uses: zephraph/toolchain@support-toolchain-toml
         with:
           profile: minimal
           override: true
@@ -49,18 +52,19 @@ jobs:
         run: cargo clean
 
       - name: get latest grcov binary
-        uses: dsaltares/fetch-gh-release-asset@0.0.5
+        uses: dsaltares/fetch-gh-release-asset@0.0.7
         with:
           repo: mozilla/grcov
-          version: "latest"
-          file: ${{ matrix.cfg.grcov }}
+          # TODO: use `version: "latest"` and wildcard in the `file`
+          version: ${{ matrix.cfg.grcov.version }}
+          file: ${{ matrix.cfg.grcov.file }}
 
       - name: unpack grcov release binary
         run: |
-          tar -xvf ${{ matrix.cfg.grcov }}
+          tar -xvf ${{ matrix.cfg.grcov.file }}
           sudo chown runner ./grcov && chmod +x ./grcov
           cp grcov ~/.cargo/bin/grcov
-          rm ${{ matrix.cfg.grcov }}
+          rm ${{ matrix.cfg.grcov.file }}
 
       - name: cache Dove
         uses: actions/cache@v2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -148,19 +148,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - id: rust # MSRV
-        name: Read required Rust version
-        run: |
-          echo "WASM_BUILD_TOOLCHAIN=$(cat rust-toolchain)" >> $GITHUB_ENV
-          echo ::set-output name=version::$(cat rust-toolchain)
-
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        # uses: actions-rs/toolchain@v1
+        uses: zephraph/toolchain@support-toolchain-toml
         with:
-          toolchain: ${{ steps.rust.outputs.version }}
           profile: minimal
           target: wasm32-unknown-unknown
-          override: false
+          override: true
 
       - name: Restore Rust cache
         uses: Swatinem/rust-cache@v1
@@ -173,7 +167,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        run: cargo +${{ steps.rust.outputs.version }} build --release
+        run: cargo build --release
 
       - name: Upload Node
         uses: actions/upload-release-asset@v1

diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml
@@ -17,7 +17,7 @@ jobs:
         name: try create tag
         uses: pontem-network/tag-crate-version@main
         with:
-          crate: pontem-node
+          crate: pontem
           version-to-tag: "v$1"
           token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -33,19 +33,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - id: rust # MSRV
-        name: use required Rust version
-        run: |
-          echo "WASM_BUILD_TOOLCHAIN=$(cat rust-toolchain)" >> $GITHUB_ENV
-          echo ::set-output name=version::$(cat rust-toolchain)
-
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        # uses: actions-rs/toolchain@v1
+        uses: zephraph/toolchain@support-toolchain-toml
         with:
-          toolchain: ${{ steps.rust.outputs.version }}
           profile: minimal
           components: rustfmt
-          override: false
+          override: true
 
       - name: Check formatting
         run: cargo fmt -- --check
@@ -66,7 +60,7 @@ jobs:
         run: make assets
 
       - name: Tests
-        run: cargo +${{ steps.rust.outputs.version }} test --all --no-fail-fast -- --nocapture --test-threads=1
+        run: cargo test --all --no-fail-fast -- --nocapture --test-threads=1
         env: { SKIP_WASM_BUILD: 1 }
 
   clippy:
@@ -89,16 +83,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - id: rust # MSRV
-        name: use required Rust version
-        run: |
-          echo "WASM_BUILD_TOOLCHAIN=$(cat rust-toolchain)" >> $GITHUB_ENV
-          echo ::set-output name=version::$(cat rust-toolchain)
-
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        # uses: actions-rs/toolchain@v1
+        uses: zephraph/toolchain@support-toolchain-toml
         with:
-          toolchain: ${{ steps.rust.outputs.version }}
           profile: minimal
           components: clippy
           target: wasm32-unknown-unknown
@@ -115,7 +103,6 @@ jobs:
         uses: actions-rs/clippy-check@v1
         with:
           name: Clippy report
-          toolchain: ${{ steps.rust.outputs.version }}
           token: ${{ secrets.GITHUB_TOKEN }}
           args: -p=sp-mvm -p=sp-mvm-rpc -p=sp-mvm-rpc-runtime
 
@@ -141,19 +128,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - id: rust # MSRV
-        name: use required Rust version
-        run: |
-          echo "WASM_BUILD_TOOLCHAIN=$(cat rust-toolchain)" >> $GITHUB_ENV
-          echo ::set-output name=version::$(cat rust-toolchain)
-
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        # uses: actions-rs/toolchain@v1
+        uses: zephraph/toolchain@support-toolchain-toml
         with:
-          toolchain: ${{ steps.rust.outputs.version }}
           profile: minimal
           target: wasm32-unknown-unknown
-          override: false
+          override: true
 
       - name: get dove
         uses: pontem-network/get-dove@main
@@ -163,7 +144,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        run: cargo +${{ steps.rust.outputs.version }} build --all
+        run: cargo build --all
 
       - name: make artifact
         if: "contains(github.event.head_commit.message, 'save artifact') || contains(github.event.head_commit.message, '+artifact')"
@@ -198,19 +179,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - id: rust # MSRV
-        name: use required Rust version
-        run: |
-          echo "WASM_BUILD_TOOLCHAIN=$(cat rust-toolchain)" >> $GITHUB_ENV
-          echo ::set-output name=version::$(cat rust-toolchain)
-
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        # uses: actions-rs/toolchain@v1
+        uses: zephraph/toolchain@support-toolchain-toml
         with:
-          toolchain: ${{ steps.rust.outputs.version }}
           profile: minimal
           target: wasm32-unknown-unknown
-          override: false
+          override: true
 
       - name: get dove
         uses: pontem-network/get-dove@main
@@ -220,7 +195,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        run: cargo +${{ steps.rust.outputs.version }} build --features "runtime-benchmarks" --release
+        run: cargo build --features "runtime-benchmarks" --release
 
       - name: Run benchmarks
         run: |

diff --git a/rust-toolchain b/rust-toolchain
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 channel = "nightly-2021-11-07"
-progile = "complete"
+profile = "complete"
 targets = [ "wasm32-unknown-unknown"]