From 9fd8a1fb14403ea48089b7e49d5949109df45985 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Mon, 2 Oct 2023 14:40:22 +0100 Subject: [PATCH 01/17] fix: Update runners for each workflow job --- .github/workflows/docker-hub-parachain.yml | 4 ++-- .github/workflows/docker-hub.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-hub-parachain.yml b/.github/workflows/docker-hub-parachain.yml index f7ed10980..0d3d0aa75 100644 --- a/.github/workflows/docker-hub-parachain.yml +++ b/.github/workflows/docker-hub-parachain.yml @@ -8,7 +8,7 @@ on: jobs: hadolint: - runs-on: ubuntu-20.04 + runs-on: zeitgeist-runner name: "Hadolint" steps: - uses: actions/checkout@v3 @@ -19,7 +19,7 @@ jobs: publish: needs: hadolint name: Publish - runs-on: ubuntu-latest + runs-on: zeitgeist-runner steps: - uses: actions/checkout@v3 - name: Checkout repository diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index 8a7c2f584..bd21c98b1 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -8,7 +8,7 @@ on: jobs: hadolint: - runs-on: ubuntu-20.04 + runs-on: zeitgeist-runner name: "Hadolint" steps: - uses: actions/checkout@v3 @@ -19,7 +19,7 @@ jobs: publish: needs: hadolint name: Publish - runs-on: ubuntu-latest + runs-on: zeitgeist-runner steps: - name: Checkout repository uses: actions/checkout@v2 From d416376a35da438893778de4b0d6d0a4244181cc Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Wed, 4 Oct 2023 10:58:23 +0100 Subject: [PATCH 02/17] chore: Add 'self-hosted' to resource-intensive jobs --- .github/workflows/docker-hub-parachain.yml | 4 ++-- .github/workflows/docker-hub.yml | 2 +- .github/workflows/rust.yml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-hub-parachain.yml b/.github/workflows/docker-hub-parachain.yml index 0d3d0aa75..6e66b43d7 100644 --- a/.github/workflows/docker-hub-parachain.yml +++ b/.github/workflows/docker-hub-parachain.yml @@ -8,7 +8,7 @@ on: jobs: hadolint: - runs-on: zeitgeist-runner + runs-on: [self-hosted, zeitgeist-runner] name: "Hadolint" steps: - uses: actions/checkout@v3 @@ -19,7 +19,7 @@ jobs: publish: needs: hadolint name: Publish - runs-on: zeitgeist-runner + runs-on: [self-hosted, zeitgeist-runner] steps: - uses: actions/checkout@v3 - name: Checkout repository diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index bd21c98b1..bbf55bb77 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -8,7 +8,7 @@ on: jobs: hadolint: - runs-on: zeitgeist-runner + runs-on: [self-hosted, zeitgeist-runner] name: "Hadolint" steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4d52a85ec..6e28f62ce 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -68,7 +68,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: ubuntu-latest + runs-on: [self-hosted, zeitgeist-runner] strategy: matrix: scripts: [ @@ -96,7 +96,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: ubuntu-latest + runs-on: [self-hosted, zeitgeist-runner] steps: - name: Checkout repository uses: actions/checkout@v2 @@ -148,7 +148,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: ubuntu-latest + runs-on: [self-hosted, zeitgeist-runner] steps: - name: Checkout repository uses: actions/checkout@v2 From 5a161b89bf5440057ed1a20b00c3f747eab6fd91 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 12:21:24 +0100 Subject: [PATCH 03/17] fix: Set all workflows to self-hosted runner --- .github/workflows/rust.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6e28f62ce..cd7ce33b3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,7 +17,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: ubuntu-latest + runs-on: [self-hosted, zeitgeist-runner] steps: - name: Checkout repository uses: actions/checkout@v2 @@ -43,7 +43,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: ubuntu-latest + runs-on: [self-hosted, zeitgeist-runner] steps: - name: Checkout repository uses: actions/checkout@v2 @@ -113,7 +113,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: ubuntu-latest + runs-on: [self-hosted, zeitgeist-runner] steps: - name: Checkout repository uses: actions/checkout@v2 @@ -183,7 +183,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: ubuntu-latest + runs-on: [self-hosted, zeitgeist-runner] steps: - name: Checkout repository uses: actions/checkout@v2 From 87d5bf88cee3cfccb7e06fd43532d0a3b49543ce Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 16:42:53 +0100 Subject: [PATCH 04/17] fix: Update shell --- scripts/init.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/init.sh b/scripts/init.sh index 8cee5890e..9dec0a82f 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -18,3 +18,5 @@ fi curl https://sh.rustup.rs -sSf | sh -s -- -y && \ . "$HOME/.cargo/env" && \ rustup show + +source "$HOME/.cargo/env" \ No newline at end of file From 3c7da233693b1a850e020f162d3e11d720c16a87 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 16:45:52 +0100 Subject: [PATCH 05/17] chore: Revert fix update shell --- scripts/init.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/init.sh b/scripts/init.sh index 9dec0a82f..cd63d2b3f 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -17,6 +17,4 @@ fi curl https://sh.rustup.rs -sSf | sh -s -- -y && \ . "$HOME/.cargo/env" && \ - rustup show - -source "$HOME/.cargo/env" \ No newline at end of file + rustup show \ No newline at end of file From 166fccd9039f790769ac8deb37cadd11e512e793 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 21:16:29 +0100 Subject: [PATCH 06/17] fix: Update shell --- scripts/init.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/init.sh b/scripts/init.sh index cd63d2b3f..b71cec1dc 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -17,4 +17,6 @@ fi curl https://sh.rustup.rs -sSf | sh -s -- -y && \ . "$HOME/.cargo/env" && \ - rustup show \ No newline at end of file + rustup show + +exec bash -l \ No newline at end of file From fcdd15c1e3b91f7489ba57c64275d312a92a4bc9 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 21:19:20 +0100 Subject: [PATCH 07/17] chore: Revert fix update shell --- scripts/init.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/init.sh b/scripts/init.sh index b71cec1dc..cd63d2b3f 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -17,6 +17,4 @@ fi curl https://sh.rustup.rs -sSf | sh -s -- -y && \ . "$HOME/.cargo/env" && \ - rustup show - -exec bash -l \ No newline at end of file + rustup show \ No newline at end of file From 8ac48590c9674883c36e83145c03d9b2fa4bf434 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 21:28:01 +0100 Subject: [PATCH 08/17] fix: Update shell --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index cd7ce33b3..20315e158 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -103,6 +103,8 @@ jobs: - name: Install build tools run: ./scripts/init.sh + + - shell: bash -l - run: ./scripts/benchmarks/quick_check.sh From f12e9c23df63039e37b78efb60d002ad3de34b19 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 21:31:49 +0100 Subject: [PATCH 09/17] fix: Update shell --- .github/workflows/rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 20315e158..7b3c447d0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -104,7 +104,8 @@ jobs: - name: Install build tools run: ./scripts/init.sh - - shell: bash -l + - name: Update Shell + shell: bash -l - run: ./scripts/benchmarks/quick_check.sh From 67cba8be7372e989f5c2f37ebb0cc2f402245585 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 21:34:59 +0100 Subject: [PATCH 10/17] fix: Update shell --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7b3c447d0..84afcd83f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -106,6 +106,8 @@ jobs: - name: Update Shell shell: bash -l + run: | + cargo --version - run: ./scripts/benchmarks/quick_check.sh From 4d6d5499497e7d5d1443c2722411cab3a1814a8a Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 21:36:56 +0100 Subject: [PATCH 11/17] fix: Update shell --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 84afcd83f..5e9189bb1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -107,7 +107,7 @@ jobs: - name: Update Shell shell: bash -l run: | - cargo --version + cargo --version - run: ./scripts/benchmarks/quick_check.sh From e03ce0e00e1c3c0d2bda4b1a600bcef73f5144a6 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Thu, 12 Oct 2023 21:45:38 +0100 Subject: [PATCH 12/17] fix: Update shell --- .github/workflows/rust.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5e9189bb1..efed54e2f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -103,13 +103,10 @@ jobs: - name: Install build tools run: ./scripts/init.sh - - - name: Update Shell - shell: bash -l - run: | - cargo --version - - run: ./scripts/benchmarks/quick_check.sh + - run: | + source $HOME/.cargo/env + ./scripts/benchmarks/quick_check.sh test_standalone: name: Test standalone build From 0366c1a6979836f1d4191a212a47907353e37a77 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Sun, 15 Oct 2023 21:56:24 +0100 Subject: [PATCH 13/17] fix: Update shell --- .github/workflows/rust.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index efed54e2f..a211d6f4b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -102,11 +102,11 @@ jobs: uses: actions/checkout@v2 - name: Install build tools - run: ./scripts/init.sh - - - run: | + run: | + ./scripts/init.sh source $HOME/.cargo/env - ./scripts/benchmarks/quick_check.sh + + - run: ./scripts/benchmarks/quick_check.sh test_standalone: name: Test standalone build From 2daffcd7685fc00006226c7d6db48a5deb37709a Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Sun, 15 Oct 2023 23:06:50 +0100 Subject: [PATCH 14/17] fix: Update shell --- .github/workflows/rust.yml | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a211d6f4b..aec0a07d9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -34,7 +34,9 @@ jobs: uses: Swatinem/rust-cache@v1 - name: Format - run: ./scripts/tests/format.sh --check + run: | + source $HOME/.cargo/env + ./scripts/tests/format.sh --check copyright: name: Copyright Notices @@ -87,7 +89,9 @@ jobs: uses: Swatinem/rust-cache@v2 - name: Checks - run: ./scripts/tests/${{ matrix.scripts }}.sh + run: | + source $HOME/.cargo/env + ./scripts/tests/${{ matrix.scripts }}.sh benchmark: name: Quick check benchmarks @@ -102,11 +106,11 @@ jobs: uses: actions/checkout@v2 - name: Install build tools - run: | - ./scripts/init.sh - source $HOME/.cargo/env + run: ./scripts/init.sh - - run: ./scripts/benchmarks/quick_check.sh + - run: | + source $HOME/.cargo/env + ./scripts/benchmarks/quick_check.sh test_standalone: name: Test standalone build @@ -141,7 +145,9 @@ jobs: uses: Swatinem/rust-cache@v1 - name: Tests - run: ./scripts/tests/test_standalone.sh + run: | + source $HOME/.cargo/env + ./scripts/tests/test_standalone.sh test_parachain: name: Test parachain build @@ -176,7 +182,9 @@ jobs: uses: Swatinem/rust-cache@v1 - name: Tests - run: ./scripts/tests/test_parachain.sh + run: | + source $HOME/.cargo/env + ./scripts/tests/test_parachain.sh fuzz: name: Fuzz @@ -201,4 +209,7 @@ jobs: - name: Cache Dependencies uses: Swatinem/rust-cache@v1 - - run: ./scripts/tests/fuzz.sh --verbose + - name: Fuzz Test + run: | + source $HOME/.cargo/env + ./scripts/tests/fuzz.sh --verbose From 4ab9967770f911be4ea1a0228f58f1a1ab78c297 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Mon, 16 Oct 2023 11:46:15 +0100 Subject: [PATCH 15/17] chore: Revert some jobs to gh runners and configure shell for sh runners --- .github/workflows/rust.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index aec0a07d9..f0ba279f6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,7 +17,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: [self-hosted, zeitgeist-runner] + runs-on: [ubuntu-latest] steps: - name: Checkout repository uses: actions/checkout@v2 @@ -34,9 +34,7 @@ jobs: uses: Swatinem/rust-cache@v1 - name: Format - run: | - source $HOME/.cargo/env - ./scripts/tests/format.sh --check + run: ./scripts/tests/format.sh --check copyright: name: Copyright Notices @@ -119,7 +117,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: [self-hosted, zeitgeist-runner] + runs-on: [ubuntu-latest] steps: - name: Checkout repository uses: actions/checkout@v2 @@ -145,9 +143,7 @@ jobs: uses: Swatinem/rust-cache@v1 - name: Tests - run: | - source $HOME/.cargo/env - ./scripts/tests/test_standalone.sh + run: ./scripts/tests/test_standalone.sh test_parachain: name: Test parachain build @@ -193,7 +189,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 's:review-needed') || contains(github.event.pull_request.labels.*.name, 's:accepted')) || github.event_name == 'push' - runs-on: [self-hosted, zeitgeist-runner] + runs-on: [ubuntu-latest] steps: - name: Checkout repository uses: actions/checkout@v2 @@ -209,7 +205,4 @@ jobs: - name: Cache Dependencies uses: Swatinem/rust-cache@v1 - - name: Fuzz Test - run: | - source $HOME/.cargo/env - ./scripts/tests/fuzz.sh --verbose + - run: ./scripts/tests/fuzz.sh --verbose From ef8e39f48237306b690e643b2ff6d29073005578 Mon Sep 17 00:00:00 2001 From: samuelarogbonlo Date: Mon, 16 Oct 2023 11:47:22 +0100 Subject: [PATCH 16/17] fix: Resolve test parachain build job failure --- scripts/init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/init.sh b/scripts/init.sh index cd63d2b3f..8a5320155 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -9,10 +9,10 @@ echo "*** Initializing build environment" if [ "$1" == "nosudo" ]; then apt-get update && \ - apt-get install -y build-essential clang curl libssl-dev protobuf-compiler + apt-get install -y build-essential clang curl libssl-dev protobuf-compiler gcc-multilib else sudo apt-get update && \ - sudo apt-get install -y build-essential clang curl libssl-dev protobuf-compiler + sudo apt-get install -y build-essential clang curl libssl-dev protobuf-compiler gcc-multilib fi curl https://sh.rustup.rs -sSf | sh -s -- -y && \ From c56d49aeedd2fda2b4bef3640f323acb1f3af581 Mon Sep 17 00:00:00 2001 From: Harald Heckmann Date: Thu, 7 Dec 2023 21:51:46 +0530 Subject: [PATCH 17/17] Update .github/workflows/rust.yml Co-authored-by: Malte Kliemann --- .github/workflows/rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f0ba279f6..50b0d2baa 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -106,7 +106,8 @@ jobs: - name: Install build tools run: ./scripts/init.sh - - run: | + - name: Check benchmarks + run: | source $HOME/.cargo/env ./scripts/benchmarks/quick_check.sh