Upgrade CI (#579)

humanode-network · Mar 4, 2023 · 4ccff76 · 4ccff76
1 parent e9cd4fa
commit 4ccff76
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 33 deletions.
diff --git a/.github/actions/plan/action.yml b/.github/actions/plan/action.yml
@@ -12,7 +12,7 @@ runs:
   using: "composite"
   steps:
     - name: Compute matrix
-      uses: actions/github-script@v4
+      uses: actions/github-script@v6
       id: set-matrix
       env:
         PLAN_NAME: ${{ inputs.plan-name }}

diff --git a/.github/actions/plan/plan.js b/.github/actions/plan/plan.js
@@ -5,7 +5,7 @@ const buildEnvScriptPath = (script) => `.github/scripts/build_env/${script}`;
 const allPlatforms = {
   ubuntu: {
     name: "Ubuntu",
-    os: "ubuntu-20.04",
+    os: "ubuntu-22.04",
     buildEnvScript: buildEnvScriptPath("ubuntu.sh"),
     isOnSelfHostedRunner: false,
     essential: true,

diff --git a/.github/scripts/build_env/macos.sh b/.github/scripts/build_env/macos.sh
@@ -1,21 +1,6 @@
 #!/bin/bash
 set -euo pipefail
 
-# Undo the Rosetta hack if needed.
-PROC_TRANSLATED="$(sysctl -n sysctl.proc_translated || true)"
-CURRENT_ARCH="$(uname -m)"
-if [[ "$PROC_TRANSLATED" == "1" && "$CURRENT_ARCH" == "x86_64" ]]; then
-  if [[ "${MACOS_ROSETTA_HACK_UNDONE:-}" == "true" ]]; then
-    printf "Seems like we've fallen into a loop of rosetta hack undoing, crashing the run.\n" >&2
-    exit 1
-  fi
-
-  export MACOS_ROSETTA_HACK_UNDONE=true
-  # Here we assume the native arch is arm64...
-  set -x
-  exec arch -arm64 "$0" "$@"
-fi
-
 brew install \
   coreutils
 

diff --git a/.github/scripts/build_env/ubuntu.sh b/.github/scripts/build_env/ubuntu.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 MOLD_GITHUB_REPO="rui314/mold"
-MOLD_VERSION="1.2.1"
+MOLD_VERSION="1.10.1"
 MOLD_INSTALL_PATH="${HOME}/.local"
 
 mkdir -p "$MOLD_INSTALL_PATH"

diff --git a/.github/scripts/protoc.sh b/.github/scripts/protoc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-PROTOBUF_VERSION="21.7"
+PROTOBUF_VERSION="22.0"
 PROTOBUF_RELEASES_URL="https://github.com/protocolbuffers/protobuf/releases"
 
 # Aw, how cure, they use python instead of uname...

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
   draft-release:
     name: Create a release draft
     if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       release-id: ${{ steps.create-release.outputs.id }}
       upload-url: ${{ steps.create-release.outputs.upload_url }}
@@ -43,7 +43,7 @@ jobs:
 
   plan:
     name: Plan the execution
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     permissions:
@@ -158,7 +158,7 @@ jobs:
       - build
     name: Publish release
     if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 50
     permissions:
       contents: write

diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -21,7 +21,7 @@ jobs:
 
   plan:
     name: Plan the execution
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     permissions:
@@ -95,7 +95,7 @@ jobs:
 
   e2e:
     name: End-to-end tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 50
     permissions:
       contents: read
@@ -135,7 +135,7 @@ jobs:
             run: utils/checks/features
       fail-fast: false
     name: ${{ matrix.util.name }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     permissions:
       contents: read

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -15,7 +15,7 @@ jobs:
 
   docker:
     name: Docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 50
     permissions:
       contents: read

diff --git a/.github/workflows/toml.yml b/.github/workflows/toml.yml
@@ -13,22 +13,26 @@ jobs:
 
   taplo:
     name: taplo
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
     steps:
 
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Install taplo
+        run: >
+          curl -sSL "https://github.com/tamasfe/taplo/releases/download/0.8.0/taplo-linux-x86_64.gz" |
+            zcat > /usr/local/bin/taplo \
+          && chmod +x /usr/local/bin/taplo
+
       - name: Check TOML files format
-        run: npx @taplo/[email protected] format --check
-        env:
-          npm_config_yes: "true"
+        run: taplo format --check
 
   cargo-sort:
     name: cargo-sort
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
     steps:
@@ -38,7 +42,7 @@ jobs:
 
       - name: Install cargo-sort
         run: >
-          curl -sSL "https://github.com/DevinR528/cargo-sort/releases/download/v1.0.5/cargo-sort-x86_64-unknown-linux-gnu.tar.gz" |
+          curl -sSL "https://github.com/DevinR528/cargo-sort/releases/download/v1.0.9/cargo-sort-x86_64-unknown-linux-gnu.tar.gz" |
             sudo tar -xzvf - -C /usr/local/bin
 
       - name: Lint TOML files

diff --git a/crates/pallet-evm-accounts-mapping/Cargo.toml b/crates/pallet-evm-accounts-mapping/Cargo.toml
@@ -14,7 +14,6 @@ frame-system = { default-features = false, git = "https://github.com/humanode-ne
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
 
-
 [dev-dependencies]
 mockall = "0.11"
 sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }