Merge branch 'master' into master

encointer · Jul 31, 2024 · 0327cd2 · 0327cd2
2 parents 8fede32 + 4b328d0
commit 0327cd2
Show file tree

Hide file tree

Showing 9 changed files with 1,841 additions and 1,630 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+*'
   pull_request:
-    branches: [master]
+    branches: [ master ]
   workflow_dispatch:
     inputs:
       verbose:
@@ -17,34 +17,30 @@ on:
 
 env:
   VERBOSE: ${{ github.events.input.verbose }}
-  SUBWASM_VERSION: 0.14.1
 
+# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
+# triggered (ref https://stackoverflow.com/a/72408109)
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  cancel_previous_runs:
-    name: Cancel Previous Runs
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: styfle/[email protected]
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
-
   build_primary_binaries:
     name: Primary build ${{ matrix.binary }} for ${{ matrix.rust-target }} on (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        rust: [stable]
-        binary: [release]
+        os: [ ubuntu-20.04 ]
+        rust: [ stable ]
+        binary: [ release ]
     env:
       RUST_BACKTRACE: full
       RUSTV: ${{ matrix.rust }}
       TARGET: ${{ matrix.rust-target }}
       RUST_BIN_DIR: target/${{ matrix.rust-target }}/debug
       RELEASE_NAME: debug
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install protoc
         run: sudo apt-get install protobuf-compiler
 
@@ -67,54 +63,16 @@ jobs:
 
       # Upload artifacts
       - name: Upload encointer-collator
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: encointer-collator-${{ github.sha }}
           path: target/release/encointer-collator
 
-
-  # Run all checks and unit test. This always run on debug mode
-  check:
-    name: Rust check ${{ matrix.check }} (${{ matrix.rust-target }})
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        rust: [stable]
-        rust-target: [x86_64-unknown-linux-gnu]
-        check: [fmt] # ignore clippy for now
-    env:
-      RUST_BACKTRACE: full
-      RUSTV: ${{ matrix.rust }}
-      TARGET: ${{ matrix.rust-target }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install protoc
-        run: sudo apt-get install protobuf-compiler
-
-      # With rustup's nice new toml format, we just need to run rustup show to install the toolchain
-      # https://github.com/actions-rs/toolchain/issues/126#issuecomment-782989659
-      - name: Setup Rust toolchain
-        run: rustup show
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.rust-target }}-${{ matrix.check }}
-
-      - name: Fmt
-        if: ${{ matrix.check == 'fmt' }}
-        run: cargo fmt --all -- --check
-
-      - name: Clippy
-        if: ${{ matrix.check == 'clippy' }}
-        run: cargo clippy -- -D warnings
-
   cargo-toml-fmt:
     runs-on: ubuntu-latest
     container: "tamasfe/taplo:0.7.0-alpine"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run Taplo fmt
         run: taplo fmt --check
@@ -135,9 +93,9 @@ jobs:
         config: [ rococo, westend, kusama ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: encointer-collator-${{ github.sha }}
 
@@ -159,7 +117,7 @@ jobs:
           sha256sum ${{ env.CHAIN_SPEC }}.json.state >> checksums.txt
 
       - name: Upload ${{ env.CHAIN_SPEC }} Files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.CHAIN_SPEC }}-genesis-spec-${{ github.sha }}
           path: |
@@ -172,15 +130,15 @@ jobs:
     name: Draft Release
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
-    needs: [create_artifacts, build_primary_binaries, check]
+    needs: [ create_artifacts, build_primary_binaries ]
     outputs:
       release_url: ${{ steps.create-release.outputs.html_url }}
       asset_upload_url: ${{ steps.create-release.outputs.upload_url }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download Integritee Collator
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: encointer-collator-${{ github.sha }}
 

diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
@@ -0,0 +1,34 @@
+name: "Rustfmt (check)"
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+-dev*'
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+    inputs:
+      verbose:
+        description: "Set --verbose to get verbose build output"
+        required: false
+        default: 'true'
+
+jobs:
+  rustfmt:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set rust version via common env file
+        run: cat .github/env >> $GITHUB_ENV
+
+      - name: Install nightly toolchain
+        run: rustup toolchain install "nightly-$RUST_NIGHTLY_VERSION" --profile minimal --component rustfmt
+
+      - name: Rustfmt (check)
+        run: cargo +nightly-$RUST_NIGHTLY_VERSION fmt --all -- --check
diff --git a/.github/workflows/publish-docker-release.yml b/.github/workflows/publish-docker-release.yml
@@ -10,7 +10,7 @@ jobs:
     name: Push to Dockerhub
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Download encointer-collator from release
         uses: dsaltares/fetch-gh-release-asset@master
@@ -21,25 +21,25 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-         path: /tmp/.buildx-cache
-         key: ${{ runner.os }}-buildx-${{ github.sha }}
-         restore-keys: |
-           ${{ runner.os }}-buildx-
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Build and push
-        id:   docker_build
-        uses: docker/build-push-action@v3
+        id: docker_build
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .