From b87d2dd193a62521921e1587775a1ac4c9ac0fe0 Mon Sep 17 00:00:00 2001 From: sferatime Date: Tue, 5 Nov 2024 22:55:01 +0800 Subject: [PATCH 01/14] Updated run-on to k8s runner --- .github/workflows/lint.yml | 4 +++- .github/workflows/semgrep.yml | 6 +++--- .github/workflows/test.yml | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b0eb346e8..d3cb286b8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,7 +9,9 @@ on: jobs: run-linters: name: Forge Linting - runs-on: ubuntu-latest + runs-on: ["self-hosted", "k8s-prod"] + container: + image: ubuntu:24.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index c773069bd..091315efb 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -10,12 +10,12 @@ on: - cron: '35 11 * * *' jobs: semgrep: + runs-on: ["self-hosted", "k8s-prod"] + container: + image: returntocorp/semgrep:1.95 name: semgrep/ci - runs-on: ubuntu-20.04 env: SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }} - container: - image: returntocorp/semgrep if: (github.actor != 'dependabot[bot]') steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 73de4cdbe..22ac41e65 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,9 @@ on: jobs: run-tests: name: Forge Tests - runs-on: ubuntu-latest + runs-on: ["self-hosted", "k8s-prod"] + container: + image: ubuntu:24.04 steps: - uses: actions/checkout@v3 From d4ded85878422087181a7fea1a89133406a46c5a Mon Sep 17 00:00:00 2001 From: sferatime Date: Tue, 5 Nov 2024 22:57:43 +0800 Subject: [PATCH 02/14] Updated checkout action --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d3cb286b8..67ea63670 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: image: ubuntu:24.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22ac41e65..44f065efa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: image: ubuntu:24.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive From ca261ee06521c8ac97581a494203703fcc03ed35 Mon Sep 17 00:00:00 2001 From: sferatime Date: Tue, 5 Nov 2024 23:09:59 +0800 Subject: [PATCH 03/14] Replaced image --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 67ea63670..c935d030e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,7 +11,7 @@ jobs: name: Forge Linting runs-on: ["self-hosted", "k8s-prod"] container: - image: ubuntu:24.04 + image: bitnami/git:2.47.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 44f065efa..71facaefd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: name: Forge Tests runs-on: ["self-hosted", "k8s-prod"] container: - image: ubuntu:24.04 + image: bitnami/git:2.47.0 steps: - uses: actions/checkout@v4 From b164e129b78b86d7e4403dbf1fb274b65c68aeb8 Mon Sep 17 00:00:00 2001 From: sferatime Date: Thu, 7 Nov 2024 18:14:29 +0800 Subject: [PATCH 04/14] Updated action --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c935d030e..bc679871f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 + uses: foundry-rs/foundry-toolchain@v1.2.0 with: version: nightly diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 71facaefd..21a0e511e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 + uses: foundry-rs/foundry-toolchain@v1.2.0 with: version: nightly From 5d4bb6be5c007f87348160c8b5bb3ac29a42160f Mon Sep 17 00:00:00 2001 From: sferatime Date: Thu, 7 Nov 2024 18:31:27 +0800 Subject: [PATCH 05/14] Disable cache --- .github/workflows/lint.yml | 1 + .github/workflows/test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bc679871f..18f3bbb56 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,6 +22,7 @@ jobs: uses: foundry-rs/foundry-toolchain@v1.2.0 with: version: nightly + cache: false - name: Check format run: forge fmt --check diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 21a0e511e..915a72aa4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,6 +22,7 @@ jobs: uses: foundry-rs/foundry-toolchain@v1.2.0 with: version: nightly + cache: false - name: Run tests run: forge test --isolate -vvv From 27e50ac5a9a1b708704abaf25c22da625ccffc94 Mon Sep 17 00:00:00 2001 From: sferatime Date: Thu, 7 Nov 2024 20:59:25 +0800 Subject: [PATCH 06/14] Use standard image --- .github/workflows/lint.yml | 7 ++++--- .github/workflows/test.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 18f3bbb56..f1b837f1b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,16 +10,17 @@ jobs: run-linters: name: Forge Linting runs-on: ["self-hosted", "k8s-prod"] - container: - image: bitnami/git:2.47.0 steps: + - name: Install Git + run: apt update && apt install git -y + - uses: actions/checkout@v4 with: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1.2.0 + uses: foundry-rs/foundry-toolchain@v1 with: version: nightly cache: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 915a72aa4..22cf577d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,16 +10,17 @@ jobs: run-tests: name: Forge Tests runs-on: ["self-hosted", "k8s-prod"] - container: - image: bitnami/git:2.47.0 steps: + - name: Install Git + run: apt update && apt install git -y + - uses: actions/checkout@v4 with: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1.2.0 + uses: foundry-rs/foundry-toolchain@v1 with: version: nightly cache: false From 97304aef7cb7be0e6558c305b9a8d3453817cc73 Mon Sep 17 00:00:00 2001 From: sferatime Date: Thu, 7 Nov 2024 21:00:27 +0800 Subject: [PATCH 07/14] Fix --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f1b837f1b..58966e388 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Install Git - run: apt update && apt install git -y + run: sudo apt update && sudo apt install git -y - uses: actions/checkout@v4 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22cf577d6..42ff7f05f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Install Git - run: apt update && apt install git -y + run: sudo apt update && sudo apt install git -y - uses: actions/checkout@v4 with: From 8097b72f290877d9f50ea95df71d452a0b65b231 Mon Sep 17 00:00:00 2001 From: sferatime Date: Thu, 7 Nov 2024 22:56:22 +0800 Subject: [PATCH 08/14] Updated action --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 58966e388..70d2d4c9b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 + uses: foundry-rs/foundry-toolchain@v1.2.0 with: version: nightly cache: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 42ff7f05f..a3599be57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 + uses: foundry-rs/foundry-toolchain@v1.2.0 with: version: nightly cache: false From a8eeda2e3734bc616039cdb69ae70d77f3240078 Mon Sep 17 00:00:00 2001 From: sferatime Date: Thu, 7 Nov 2024 23:07:45 +0800 Subject: [PATCH 09/14] Debug --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 70d2d4c9b..58966e388 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1.2.0 + uses: foundry-rs/foundry-toolchain@v1 with: version: nightly cache: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a3599be57..ab7863dc5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,14 +13,14 @@ jobs: steps: - name: Install Git - run: sudo apt update && sudo apt install git -y + run: sudo apt update && sudo apt install git build-essential libssl-dev pkg-config -y - uses: actions/checkout@v4 with: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1.2.0 + uses: foundry-rs/foundry-toolchain@v1 with: version: nightly cache: false From 2fba7487f1556c8295d22386791d636a29130d9a Mon Sep 17 00:00:00 2001 From: sferatime Date: Thu, 7 Nov 2024 23:20:54 +0800 Subject: [PATCH 10/14] Debug --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab7863dc5..39b1bd3bc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 + uses: foundry-rs/foundry-toolchain@v1.2.0 with: version: nightly cache: false From a3b182ae04a6c3bf76db4c20abf366c4243b4f65 Mon Sep 17 00:00:00 2001 From: sferatime Date: Fri, 8 Nov 2024 00:05:39 +0800 Subject: [PATCH 11/14] Added docker option --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 39b1bd3bc..43bcfc716 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,10 @@ jobs: run-tests: name: Forge Tests runs-on: ["self-hosted", "k8s-prod"] + container: + image: summerwind/actions-runner:latest + options: + "--memory-reservation=12G" steps: - name: Install Git From 9fb42914e2478f11b9cc8c8e85364f7573cbb6f9 Mon Sep 17 00:00:00 2001 From: sferatime Date: Fri, 8 Nov 2024 00:37:49 +0800 Subject: [PATCH 12/14] Set foundry-toolchain@v1 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 43bcfc716..538b1c526 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: submodules: recursive - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1.2.0 + uses: foundry-rs/foundry-toolchain@v1 with: version: nightly cache: false From b7334e9b32d9dfd0f7435d231caa36e294b6a27c Mon Sep 17 00:00:00 2001 From: sferatime Date: Fri, 8 Nov 2024 00:58:07 +0800 Subject: [PATCH 13/14] Unlock semgrep tag --- .github/workflows/semgrep.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 091315efb..9f20329b6 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -12,7 +12,7 @@ jobs: semgrep: runs-on: ["self-hosted", "k8s-prod"] container: - image: returntocorp/semgrep:1.95 + image: returntocorp/semgrep name: semgrep/ci env: SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }} From e1c4c9f880a06f5e1e60e61eea86621bfc337774 Mon Sep 17 00:00:00 2001 From: sferatime Date: Fri, 8 Nov 2024 01:00:35 +0800 Subject: [PATCH 14/14] Fix typo --- .github/workflows/semgrep.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 9f20329b6..169b81fe8 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -11,11 +11,11 @@ on: jobs: semgrep: runs-on: ["self-hosted", "k8s-prod"] - container: - image: returntocorp/semgrep name: semgrep/ci env: SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }} + container: + image: returntocorp/semgrep if: (github.actor != 'dependabot[bot]') steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744