From 1b1a8f3cd88312d74e8b7b0e34b929b74ef6d466 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 20:18:16 +1100 Subject: [PATCH 01/16] update runners for periphery workwflows --- .github/workflows/all-tools.yml | 2 +- .github/workflows/bridge-ui-e2e-tests.yml | 2 +- .github/workflows/bridge-ui-publish.yml | 2 +- .github/workflows/run-smc-tests.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/all-tools.yml b/.github/workflows/all-tools.yml index 24d8a4a32..d3f875539 100644 --- a/.github/workflows/all-tools.yml +++ b/.github/workflows/all-tools.yml @@ -16,7 +16,7 @@ on: jobs: changes: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small name: Filter commit changes outputs: all-tools: ${{ steps.filter.outputs['all-tools'] }} diff --git a/.github/workflows/bridge-ui-e2e-tests.yml b/.github/workflows/bridge-ui-e2e-tests.yml index d860682b3..a75b599db 100644 --- a/.github/workflows/bridge-ui-e2e-tests.yml +++ b/.github/workflows/bridge-ui-e2e-tests.yml @@ -16,7 +16,7 @@ on: jobs: run-e2e-tests: - runs-on: [self-hosted, ubuntu-20.04, X64, medium] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/bridge-ui-publish.yml b/.github/workflows/bridge-ui-publish.yml index e129c4b2e..de6cd4e0e 100644 --- a/.github/workflows/bridge-ui-publish.yml +++ b/.github/workflows/bridge-ui-publish.yml @@ -16,7 +16,7 @@ on: jobs: publish: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/run-smc-tests.yml b/.github/workflows/run-smc-tests.yml index 7f29d5386..0b6869d4d 100644 --- a/.github/workflows/run-smc-tests.yml +++ b/.github/workflows/run-smc-tests.yml @@ -29,7 +29,7 @@ env: jobs: run-contract-tests: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small name: Run smart contracts tests env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From e26c9515bfed62d7a05629cf3fc900439cb0cea4 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 20:19:56 +1100 Subject: [PATCH 02/16] add *.md exclusions for all-tools.yml --- .github/workflows/all-tools.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/all-tools.yml b/.github/workflows/all-tools.yml index d3f875539..822c91563 100644 --- a/.github/workflows/all-tools.yml +++ b/.github/workflows/all-tools.yml @@ -7,12 +7,14 @@ on: paths: - 'operations/' - '.github/workflows/all-tools.yml' + - '!operations/**/*.md' pull_request: branches: - main paths: - 'operations/' - '.github/workflows/all-tools.yml' + - '!operations/**/*.md' jobs: changes: From 78713155879be63c2b05e40ab87914728e7f9cc0 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 20:20:47 +1100 Subject: [PATCH 03/16] fake commit to trigger bridge-ui + contract ci --- bridge-ui/.dockerignore | 1 + contracts/.solhintignore | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bridge-ui/.dockerignore b/bridge-ui/.dockerignore index 8151a0cf2..cce3b74c6 100644 --- a/bridge-ui/.dockerignore +++ b/bridge-ui/.dockerignore @@ -11,3 +11,4 @@ !.next !.env.production !.env +randommate \ No newline at end of file diff --git a/contracts/.solhintignore b/contracts/.solhintignore index e60ed8fa8..f1f7b2a3d 100644 --- a/contracts/.solhintignore +++ b/contracts/.solhintignore @@ -3,4 +3,5 @@ lib/forge-std contracts/test-contracts test/foundry /contracts/proxies -/contracts/tokenBridge/mocks \ No newline at end of file +/contracts/tokenBridge/mocks +randommate \ No newline at end of file From e7447dc17bfd26230709289ee949664de70c8d7b Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 21:17:16 +1100 Subject: [PATCH 04/16] Revert "fake commit to trigger bridge-ui + contract ci" This reverts commit 78713155879be63c2b05e40ab87914728e7f9cc0. --- bridge-ui/.dockerignore | 1 - contracts/.solhintignore | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bridge-ui/.dockerignore b/bridge-ui/.dockerignore index cce3b74c6..8151a0cf2 100644 --- a/bridge-ui/.dockerignore +++ b/bridge-ui/.dockerignore @@ -11,4 +11,3 @@ !.next !.env.production !.env -randommate \ No newline at end of file diff --git a/contracts/.solhintignore b/contracts/.solhintignore index f1f7b2a3d..e60ed8fa8 100644 --- a/contracts/.solhintignore +++ b/contracts/.solhintignore @@ -3,5 +3,4 @@ lib/forge-std contracts/test-contracts test/foundry /contracts/proxies -/contracts/tokenBridge/mocks -randommate \ No newline at end of file +/contracts/tokenBridge/mocks \ No newline at end of file From ef50865f903fc235c3955b0861f315f41657fdf7 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 21:22:02 +1100 Subject: [PATCH 05/16] update runner for cache-docker-images.yml --- .github/workflows/cache-docker-images.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cache-docker-images.yml b/.github/workflows/cache-docker-images.yml index 4118e2643..96434129e 100644 --- a/.github/workflows/cache-docker-images.yml +++ b/.github/workflows/cache-docker-images.yml @@ -9,7 +9,7 @@ on: jobs: check-dockerhub-secrets-present: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} @@ -24,7 +24,7 @@ jobs: changes: needs: [ check-dockerhub-secrets-present ] if: ${{ always() && needs.check-dockerhub-secrets-present.outputs.secrets_present == 'true' }} - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small name: Filter commit changes outputs: cache_images: ${{ steps.filter.outputs.cache_images }} @@ -46,7 +46,7 @@ jobs: pull-and-cache-images: needs: [ check-dockerhub-secrets-present, changes ] if: ${{ always() && needs.check-dockerhub-secrets-present.outputs.secrets_present == 'true' && needs.changes.outputs.cache_images == 'true' }} - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small steps: - name: Checkout uses: actions/checkout@v4 From bba6bbd39bd2f26086ad8663d69c7110fc713e06 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 21:23:43 +1100 Subject: [PATCH 06/16] update runners for main.yml partially --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ebc8e990b..765fc1917 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: uses: ./.github/workflows/reuse-store-image-name-and-tags.yml filter-commit-changes: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small name: Filter commit changes outputs: coordinator: ${{ steps.filter.outputs.coordinator }} @@ -231,7 +231,7 @@ jobs: cleanup-deployments: needs: [ run-e2e-tests, run-e2e-tests-geth-tracing ] if: ${{ always() }} - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small steps: - uses: strumwolf/delete-deployment-environment@v3 with: From 7b63e3cedf06eb51a7f74e7bb3330b1d34534c4d Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 21:34:47 +1100 Subject: [PATCH 07/16] fake commit to docker-compose.yml to trigger cache-docker-images.yml --- docker/compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/compose.yml b/docker/compose.yml index d9ce8ac3f..812372aa1 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -16,7 +16,7 @@ networks: config: - subnet: 10.10.10.0/24 -# To debug inside the network and volumes +# To debug inside the network and volumes # docker run --rm -it --network=docker_linea -v=linea-local-dev:/data -v=linea-logs:/logs weibeld/ubuntu-networking bash services: From 1793caed23a7781613fb279e4c0ad9235217e9a5 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 21:48:35 +1100 Subject: [PATCH 08/16] up specs for time-constraining step in cache-docker-images.yml --- .github/workflows/cache-docker-images.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/postman-build-and-publish.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cache-docker-images.yml b/.github/workflows/cache-docker-images.yml index 96434129e..c47aacb4a 100644 --- a/.github/workflows/cache-docker-images.yml +++ b/.github/workflows/cache-docker-images.yml @@ -46,7 +46,7 @@ jobs: pull-and-cache-images: needs: [ check-dockerhub-secrets-present, changes ] if: ${{ always() && needs.check-dockerhub-secrets-present.outputs.secrets_present == 'true' && needs.changes.outputs.cache_images == 'true' }} - runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 765fc1917..79563de18 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -135,7 +135,7 @@ jobs: secrets: inherit manual-docker-build-and-e2e-tests: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small needs: [ store-image-name-and-tags, filter-commit-changes, check-and-tag-images ] if: ${{ needs.filter-commit-changes.outputs.has-changes-requiring-build == 'true' }} environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }} diff --git a/.github/workflows/postman-build-and-publish.yml b/.github/workflows/postman-build-and-publish.yml index b4cfca076..d92b78c8b 100644 --- a/.github/workflows/postman-build-and-publish.yml +++ b/.github/workflows/postman-build-and-publish.yml @@ -51,7 +51,7 @@ concurrency: jobs: build-and-publish: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small name: Postman build env: COMMIT_TAG: ${{ inputs.commit_tag }} From b8a826b2a8b8754076c3ffdd887bd3c7c13f117c Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 22:02:17 +1100 Subject: [PATCH 09/16] test old small ubuntu runner for cache-docker-images.yml --- .github/workflows/cache-docker-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cache-docker-images.yml b/.github/workflows/cache-docker-images.yml index c47aacb4a..545999c6f 100644 --- a/.github/workflows/cache-docker-images.yml +++ b/.github/workflows/cache-docker-images.yml @@ -46,7 +46,7 @@ jobs: pull-and-cache-images: needs: [ check-dockerhub-secrets-present, changes ] if: ${{ always() && needs.check-dockerhub-secrets-present.outputs.secrets_present == 'true' && needs.changes.outputs.cache_images == 'true' }} - runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med + runs-on: [self-hosted, ubuntu-20.04, X64, small] steps: - name: Checkout uses: actions/checkout@v4 From 64b47a6608b0de4a7af90ffa3fe17559460d665b Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 22:24:29 +1100 Subject: [PATCH 10/16] change all runners in all-tools --- .github/workflows/all-tools.yml | 6 +++--- .github/workflows/cache-docker-images.yml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/all-tools.yml b/.github/workflows/all-tools.yml index 46a3e9967..08a6a8328 100644 --- a/.github/workflows/all-tools.yml +++ b/.github/workflows/all-tools.yml @@ -41,7 +41,7 @@ jobs: uses: ./.github/workflows/reuse-store-image-name-and-tags.yml check_image_tags_exist: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small name: Check image tags exist needs: [ changes, store_image_name_and_tags ] if: ${{ needs.changes.outputs['all-tools'] == 'false' }} @@ -55,7 +55,7 @@ jobs: image_name: consensys/linea-alltools all-tools-tag-only: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small name: All tools tag only needs: [ changes, store_image_name_and_tags, check_image_tags_exist ] if: ${{ github.event_name != 'pull_request' && needs.changes.outputs['all-tools'] == 'false' }} @@ -79,7 +79,7 @@ jobs: build-and-publish: needs: [ changes, store_image_name_and_tags, all-tools-tag-only ] if: ${{ always() && (needs.changes.outputs['all-tools'] == 'true' || needs.all-tools-tag-only.result != 'success' || needs.all-tools-tag-only.outputs.image_tagged != 'true') }} - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small env: COMMIT_TAG: ${{ needs.store_image_name_and_tags.outputs.commit_tag }} DEVELOP_TAG: ${{ needs.store_image_name_and_tags.outputs.develop_tag }} diff --git a/.github/workflows/cache-docker-images.yml b/.github/workflows/cache-docker-images.yml index 545999c6f..dcf4031fd 100644 --- a/.github/workflows/cache-docker-images.yml +++ b/.github/workflows/cache-docker-images.yml @@ -46,7 +46,8 @@ jobs: pull-and-cache-images: needs: [ check-dockerhub-secrets-present, changes ] if: ${{ always() && needs.check-dockerhub-secrets-present.outputs.secrets_present == 'true' && needs.changes.outputs.cache_images == 'true' }} - runs-on: [self-hosted, ubuntu-20.04, X64, small] + # Unsure if superior to [self-hosted, ubuntu-20.04, X64, small], seems to take about the same amount time (6-7 mins) + runs-on: runner-scale-set-ubuntu-22.04-amd64-med steps: - name: Checkout uses: actions/checkout@v4 From fcccda42841863dc533b206a68eec4ea0bf75dde Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 22:54:46 +1100 Subject: [PATCH 11/16] Revert "fake commit to docker-compose.yml to trigger cache-docker-images.yml" This reverts commit 7b63e3cedf06eb51a7f74e7bb3330b1d34534c4d. --- docker/compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/compose.yml b/docker/compose.yml index 812372aa1..d9ce8ac3f 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -16,7 +16,7 @@ networks: config: - subnet: 10.10.10.0/24 -# To debug inside the network and volumes +# To debug inside the network and volumes # docker run --rm -it --network=docker_linea -v=linea-local-dev:/data -v=linea-logs:/logs weibeld/ubuntu-networking bash services: From 9dc378658dcea3854127fc7b9ac852575f0e4e6a Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 23:29:15 +1100 Subject: [PATCH 12/16] change traces-api-facade-testing runner --- .github/workflows/traces-api-facade-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/traces-api-facade-testing.yml b/.github/workflows/traces-api-facade-testing.yml index 4a75198ec..a38618d19 100644 --- a/.github/workflows/traces-api-facade-testing.yml +++ b/.github/workflows/traces-api-facade-testing.yml @@ -17,7 +17,7 @@ concurrency: jobs: run-tests: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med name: Traces api facade tests steps: - name: Checkout From 568efa6c6febdec7094c1f9e51312a562603b838 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Mon, 20 Jan 2025 23:48:28 +1100 Subject: [PATCH 13/16] change runner size from small to med for multiple workflows taking >2 minutes --- .github/workflows/postman-build-and-publish.yml | 2 +- .github/workflows/prover-build-and-publish.yml | 2 +- .github/workflows/transaction-exclusion-api-testing.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/postman-build-and-publish.yml b/.github/workflows/postman-build-and-publish.yml index d92b78c8b..71ade23ec 100644 --- a/.github/workflows/postman-build-and-publish.yml +++ b/.github/workflows/postman-build-and-publish.yml @@ -51,7 +51,7 @@ concurrency: jobs: build-and-publish: - runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-small + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med name: Postman build env: COMMIT_TAG: ${{ inputs.commit_tag }} diff --git a/.github/workflows/prover-build-and-publish.yml b/.github/workflows/prover-build-and-publish.yml index 1ebbf780b..0a6a216cc 100644 --- a/.github/workflows/prover-build-and-publish.yml +++ b/.github/workflows/prover-build-and-publish.yml @@ -54,7 +54,7 @@ env: jobs: build-and-publish: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med name: Prover build env: COMMIT_TAG: ${{ inputs.commit_tag }} diff --git a/.github/workflows/transaction-exclusion-api-testing.yml b/.github/workflows/transaction-exclusion-api-testing.yml index e4a9d6a8d..6a706f027 100644 --- a/.github/workflows/transaction-exclusion-api-testing.yml +++ b/.github/workflows/transaction-exclusion-api-testing.yml @@ -16,7 +16,7 @@ concurrency: jobs: run-tests: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med name: Transaction exclusion api tests steps: - name: Checkout From acc1218b6267eb0d7dfe49e539694d97d7bc9a52 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Tue, 21 Jan 2025 00:04:48 +1100 Subject: [PATCH 14/16] beefier runners for prover-testing --- .github/workflows/prover-testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prover-testing.yml b/.github/workflows/prover-testing.yml index 692c9493b..edf5d8900 100644 --- a/.github/workflows/prover-testing.yml +++ b/.github/workflows/prover-testing.yml @@ -10,7 +10,7 @@ concurrency: jobs: staticcheck: - runs-on: [self-hosted, ubuntu-20.04, X64, small] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med name: Prover static check steps: - name: install Go @@ -52,7 +52,7 @@ jobs: strategy: matrix: go-version: [1.23.x] - runs-on: [self-hosted, ubuntu-22.04, X64, large] + runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl name: Prover testing needs: - staticcheck From 166bda0569a034f8b64f6e18b586f4823b1814e4 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Tue, 21 Jan 2025 00:31:34 +1100 Subject: [PATCH 15/16] empty commit From 8ccfda427b3995b0c3a9e63e765f7ba9131107e0 Mon Sep 17 00:00:00 2001 From: kyzooghost Date: Tue, 21 Jan 2025 15:13:09 +1100 Subject: [PATCH 16/16] empty commit 2