Merge branch 'manta' into fer-change-params

Manta-Network · Aug 1, 2023 · c435f85 · c435f85
2 parents a40016d + 32dc59a
commit c435f85
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 23 deletions.
diff --git a/.github/workflows/metadata_diff.yml b/.github/workflows/metadata_diff.yml
@@ -18,7 +18,6 @@ jobs:
   start-checks:
     timeout-minutes: 120
     runs-on: runtime
-    shell: bash
     container:
       image: ubuntu:20.04
     strategy:
@@ -47,23 +46,24 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-          key: cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-
+            cargo-registry-
       - name: cache sccache
         uses: actions/cache@v2
         continue-on-error: false
         with:
-          path: /home/runner/.cache/sccache
+          path: ~/.cache/sccache
           key: sccache-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             sccache-
       - name: start sccache server
         run: sccache --start-server
       - name: init
+        shell: bash
         run: |
           apt update
-          apt install -y pkg-config libssl-dev protobuf-compiler curl
+          apt install -y pkg-config libssl-dev protobuf-compiler curl build-essential clang git
           protoc --version
           apt remove -y '^dotnet-.*'
           apt remove -y '^mongodb-.*'
@@ -79,12 +79,22 @@ jobs:
           rustup toolchain install nightly-2023-03-03
           rustup default nightly-2023-03-03
           rustup target add wasm32-unknown-unknown
+      - name: cache cargo build
+        uses: actions/cache@v2
+        with:
+          path: |
+            ./target
+          key: cargo-build-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            cargo-build-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+            cargo-build-
       - name: Build New Binary
         env:
           RUST_BACKTRACE: full
           RUSTC_WRAPPER: sccache
           SCCACHE_CACHE_SIZE: 2G
-          SCCACHE_DIR: /home/runner/.cache/sccache
+          SCCACHE_DIR: ~/.cache/sccache
+        shell: bash
         run: |
           source ${HOME}/.cargo/env
           RUSTC_BOOTSTRAP=1 cargo build --release

diff --git a/.github/workflows/publish_draft_releases.yml b/.github/workflows/publish_draft_releases.yml
@@ -13,7 +13,6 @@ jobs:
   get-rust-versions:
     if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     runs-on: runtime
-    shell: bash
     container:
       image: paritytech/ci-linux:production
     outputs:
@@ -30,7 +29,6 @@ jobs:
     timeout-minutes: 180
     if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     runs-on: runtime
-    shell: bash
     env:
       CARGO_TERM_COLOR: always
     container:
@@ -78,7 +76,6 @@ jobs:
     timeout-minutes: 180
     if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     runs-on: runtime
-    shell: bash
     container:
       image: ubuntu:20.04
     env:
@@ -112,16 +109,17 @@ jobs:
         uses: actions/cache@v2
         continue-on-error: false
         with:
-          path: /home/runner/.cache/sccache
+          path: ~/.cache/sccache
           key: sccache-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             sccache-
       - name: start sccache server
         run: sccache --start-server
       - name: init
+        shell: bash
         run: |
           apt update
-          apt install -y pkg-config libssl-dev protobuf-compiler curl
+          apt install -y pkg-config libssl-dev protobuf-compiler curl build-essential clang git
           protoc --version
           curl -s https://sh.rustup.rs -sSf | sh -s -- -y
           source ${HOME}/.cargo/env
@@ -132,11 +130,12 @@ jobs:
           rustup install 1.69.0
           rustup target add wasm32-unknown-unknown --toolchain 1.69.0
       - name: build
+        shell: bash
         env:
           RUST_BACKTRACE: full
           RUSTC_WRAPPER: sccache
           SCCACHE_CACHE_SIZE: 2G
-          SCCACHE_DIR: /home/runner/.cache/sccache
+          SCCACHE_DIR: ~/.cache/sccache
         run: |
           source ${HOME}/.cargo/env
           RUSTC_BOOTSTRAP=1 cargo +1.69.0 build --profile production --verbose
@@ -163,7 +162,6 @@ jobs:
   # THE FOLLOWING HAPPENS ONLY WHEN TAGGED WITH A vX.Y.Z TAG
   create-draft-release:
     runs-on: runtime
-    shell: bash
     needs: [build-runtimes]
     outputs:
       release_url: ${{ steps.create-release.outputs.html_url }}
@@ -181,7 +179,6 @@ jobs:
           draft: true
   publish-runtimes:
     runs-on: runtime
-    shell: bash
     needs: create-draft-release
     strategy:
       matrix:
@@ -247,7 +244,6 @@ jobs:
           asset_content_type: application/json
   publish-node:
     runs-on: runtime
-    shell: bash
     needs: [build-node-current, create-draft-release]
     outputs:
       download_url: ${{ steps.upload-manta.outputs.browser_download_url }}
@@ -268,7 +264,6 @@ jobs:
           asset_content_type: application/octet-stream
   brag:
     runs-on: runtime
-    shell: bash
     needs: [publish-runtimes, publish-node]
     if: startsWith(github.ref, 'refs/tags')
     steps:

diff --git a/.github/workflows/run_linters.yml b/.github/workflows/run_linters.yml
@@ -13,7 +13,6 @@ jobs:
   start-checks:
     timeout-minutes: 120
     runs-on: runtime
-    shell: bash
     container:
       image: ubuntu:20.04
     steps:
@@ -40,14 +39,14 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-          key: cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-
+            cargo-registry-
       - name: cache sccache
         uses: actions/cache@v2
         continue-on-error: false
         with:
-          path: /home/runner/.cache/sccache
+          path: ~/.cache/sccache
           key: sccache-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             sccache-
@@ -56,9 +55,10 @@ jobs:
       - name: init rust toolchain
         # NOTE: We use nightly Rust only to get nightly fmt & clippy
         # TODO: use nightly after https://github.com/clap-rs/clap/issues/4733 fixed.
+        shell: bash
         run: |
           apt update
-          apt install -y pkg-config libssl-dev protobuf-compiler curl
+          apt install -y pkg-config libssl-dev protobuf-compiler curl build-essential clang git
           protoc --version
           curl -s https://sh.rustup.rs -sSf | sh -s -- -y
           source ${HOME}/.cargo/env
@@ -70,18 +70,29 @@ jobs:
           RUST_BACKTRACE: full
           RUSTC_WRAPPER: sccache
           SCCACHE_CACHE_SIZE: 2G
-          SCCACHE_DIR: /home/runner/.cache/sccache
+          SCCACHE_DIR: ~/.cache/sccache
+        shell: bash
         run: |
           source ${HOME}/.cargo/env
           cargo fmt --all -- --check
           $HOME/.cargo/bin/taplo fmt --check
           $HOME/.cargo/bin/taplo lint
+      - name: cache cargo build
+        uses: actions/cache@v2
+        with:
+          path: |
+            ./target
+          key: cargo-build-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            cargo-build-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+            cargo-build-
       - name: Cargo Check & Clippy
         env:
           RUST_BACKTRACE: full
           RUSTC_WRAPPER: sccache
           SCCACHE_CACHE_SIZE: 2G
-          SCCACHE_DIR: /home/runner/.cache/sccache
+          SCCACHE_DIR: ~/.cache/sccache
+        shell: bash
         run: |
           source ${HOME}/.cargo/env
           SKIP_WASM_BUILD=1 cargo check --no-default-features