From 6f80faba0d88d4a0c157fbb019714598cd851b25 Mon Sep 17 00:00:00 2001
From: kyzooghost <jeffersonzjtang@gmail.com>
Date: Tue, 21 Jan 2025 15:29:03 +1100
Subject: [PATCH 1/4] beefed up runner for time-limiting steps

---
 .github/workflows/all-tools.yml                         | 2 +-
 .github/workflows/bridge-ui-publish.yml                 | 2 +-
 .github/workflows/cache-docker-images.yml               | 2 +-
 .github/workflows/coordinator-testing.yml               | 2 +-
 .github/workflows/postman-build-and-publish.yml         | 2 +-
 .github/workflows/prover-build-and-publish.yml          | 2 +-
 .github/workflows/prover-testing.yml                    | 4 ++--
 .github/workflows/run-smc-tests.yml                     | 2 +-
 .github/workflows/staterecovery-testing.yml             | 2 +-
 .github/workflows/traces-api-facade-testing.yml         | 2 +-
 .github/workflows/transaction-exclusion-api-testing.yml | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/all-tools.yml b/.github/workflows/all-tools.yml
index 001807db8..8564144b2 100644
--- a/.github/workflows/all-tools.yml
+++ b/.github/workflows/all-tools.yml
@@ -77,7 +77,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-med
     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/bridge-ui-publish.yml b/.github/workflows/bridge-ui-publish.yml
index b7d5d81f2..d90e87b2b 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-med
     env:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/cache-docker-images.yml b/.github/workflows/cache-docker-images.yml
index 4118e2643..482fb7496 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: [self-hosted, ubuntu-20.04, X64, small]
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/coordinator-testing.yml b/.github/workflows/coordinator-testing.yml
index 5758408d1..515ea7e09 100644
--- a/.github/workflows/coordinator-testing.yml
+++ b/.github/workflows/coordinator-testing.yml
@@ -26,7 +26,7 @@ jobs:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl
     name: Coordinator tests
     steps:
       - name: Checkout
diff --git a/.github/workflows/postman-build-and-publish.yml b/.github/workflows/postman-build-and-publish.yml
index b4cfca076..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: [self-hosted, ubuntu-20.04, X64, 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/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
diff --git a/.github/workflows/run-smc-tests.yml b/.github/workflows/run-smc-tests.yml
index 7f29d5386..52934973a 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-med
     name: Run smart contracts tests
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/staterecovery-testing.yml b/.github/workflows/staterecovery-testing.yml
index fe103911f..211db2c21 100644
--- a/.github/workflows/staterecovery-testing.yml
+++ b/.github/workflows/staterecovery-testing.yml
@@ -27,7 +27,7 @@ jobs:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl
     name: Staterecovery tests
     steps:
       - name: Checkout
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
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 9ea17c453c82e045673fbe09a922340084c79286 Mon Sep 17 00:00:00 2001
From: kyzooghost <jeffersonzjtang@gmail.com>
Date: Tue, 21 Jan 2025 16:17:59 +1100
Subject: [PATCH 2/4] up specs for e2e test runner

---
 .github/workflows/reuse-run-e2e-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reuse-run-e2e-tests.yml b/.github/workflows/reuse-run-e2e-tests.yml
index f02dadf5c..ee8aa6396 100644
--- a/.github/workflows/reuse-run-e2e-tests.yml
+++ b/.github/workflows/reuse-run-e2e-tests.yml
@@ -75,7 +75,7 @@ jobs:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     outputs:
       tests_outcome: ${{ steps.run_e2e_tests.outcome }}
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl
     steps:
       - name: Setup upterm session
         if: ${{ inputs.e2e-tests-with-ssh }}

From 34102894de839219712a0272506c1dfe5fe0e30b Mon Sep 17 00:00:00 2001
From: kyzooghost <jeffersonzjtang@gmail.com>
Date: Tue, 21 Jan 2025 17:08:31 +1100
Subject: [PATCH 3/4] update workflows with metrics in comments

---
 .github/workflows/all-tools.yml                         | 1 +
 .github/workflows/bridge-ui-publish.yml                 | 2 ++
 .github/workflows/postman-build-and-publish.yml         | 1 +
 .github/workflows/prover-build-and-publish.yml          | 1 +
 .github/workflows/prover-testing.yml                    | 2 ++
 .github/workflows/reuse-run-e2e-tests.yml               | 3 ++-
 .github/workflows/run-smc-tests.yml                     | 2 ++
 .github/workflows/staterecovery-testing.yml             | 1 +
 .github/workflows/traces-api-facade-testing.yml         | 1 +
 .github/workflows/transaction-exclusion-api-testing.yml | 1 +
 10 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/all-tools.yml b/.github/workflows/all-tools.yml
index 8564144b2..c02f5b5df 100644
--- a/.github/workflows/all-tools.yml
+++ b/.github/workflows/all-tools.yml
@@ -77,6 +77,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') }}
+    # ~0.5 mins saved vs small
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     env:
       COMMIT_TAG: ${{ needs.store_image_name_and_tags.outputs.commit_tag }}
diff --git a/.github/workflows/bridge-ui-publish.yml b/.github/workflows/bridge-ui-publish.yml
index d90e87b2b..70d8c4f09 100644
--- a/.github/workflows/bridge-ui-publish.yml
+++ b/.github/workflows/bridge-ui-publish.yml
@@ -5,12 +5,14 @@ on:
     branches:
       - main
     paths:
+      - '.github/workflows/bridge-ui-publish.yml'
       - 'bridge-ui/**'
       - '!bridge-ui/**/*.md'
   push:
     branches:
       - main
     paths:
+      - '.github/workflows/bridge-ui-publish.yml'
       - 'bridge-ui/**'
       - '!bridge-ui/**/*.md'
 
diff --git a/.github/workflows/postman-build-and-publish.yml b/.github/workflows/postman-build-and-publish.yml
index 71ade23ec..7f232cd96 100644
--- a/.github/workflows/postman-build-and-publish.yml
+++ b/.github/workflows/postman-build-and-publish.yml
@@ -51,6 +51,7 @@ concurrency:
 
 jobs:
   build-and-publish:
+    # ~1 min saved vs small
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     name: Postman build
     env:
diff --git a/.github/workflows/prover-build-and-publish.yml b/.github/workflows/prover-build-and-publish.yml
index 0a6a216cc..53b9262a1 100644
--- a/.github/workflows/prover-build-and-publish.yml
+++ b/.github/workflows/prover-build-and-publish.yml
@@ -54,6 +54,7 @@ env:
 
 jobs:
   build-and-publish:
+    # ~1 min saved vs small
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     name: Prover build
     env:
diff --git a/.github/workflows/prover-testing.yml b/.github/workflows/prover-testing.yml
index edf5d8900..da0d8b742 100644
--- a/.github/workflows/prover-testing.yml
+++ b/.github/workflows/prover-testing.yml
@@ -10,6 +10,7 @@ concurrency:
 
 jobs:
   staticcheck:
+    # ~1.5 mins saved vs small
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     name: Prover static check
     steps:
@@ -52,6 +53,7 @@ jobs:
     strategy:
       matrix:
         go-version: [1.23.x]
+    # ~1 min saved vs large
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl
     name: Prover testing
     needs:
diff --git a/.github/workflows/reuse-run-e2e-tests.yml b/.github/workflows/reuse-run-e2e-tests.yml
index ee8aa6396..789f53e28 100644
--- a/.github/workflows/reuse-run-e2e-tests.yml
+++ b/.github/workflows/reuse-run-e2e-tests.yml
@@ -75,7 +75,8 @@ jobs:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     outputs:
       tests_outcome: ${{ steps.run_e2e_tests.outcome }}
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl
+    # xl saves ~0 mins
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
     steps:
       - name: Setup upterm session
         if: ${{ inputs.e2e-tests-with-ssh }}
diff --git a/.github/workflows/run-smc-tests.yml b/.github/workflows/run-smc-tests.yml
index 52934973a..ce1b727fb 100644
--- a/.github/workflows/run-smc-tests.yml
+++ b/.github/workflows/run-smc-tests.yml
@@ -3,6 +3,7 @@ name: Smart contracts test
 on:
   pull_request:
     paths:
+      - '.github/workflows/run-smc-tests.yml'
       - 'contracts/**'
       - 'testdata/**'
       - 'prover/**'
@@ -15,6 +16,7 @@ on:
     branches:
       - main
     paths:
+      - '.github/workflows/run-smc-tests.yml'
       - 'contracts/**'
       - 'testdata/**'
       - 'prover/**'
diff --git a/.github/workflows/staterecovery-testing.yml b/.github/workflows/staterecovery-testing.yml
index 211db2c21..861ff495a 100644
--- a/.github/workflows/staterecovery-testing.yml
+++ b/.github/workflows/staterecovery-testing.yml
@@ -27,6 +27,7 @@ jobs:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    # ~2.5 mins saved vs large
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl
     name: Staterecovery tests
     steps:
diff --git a/.github/workflows/traces-api-facade-testing.yml b/.github/workflows/traces-api-facade-testing.yml
index a38618d19..a02565305 100644
--- a/.github/workflows/traces-api-facade-testing.yml
+++ b/.github/workflows/traces-api-facade-testing.yml
@@ -17,6 +17,7 @@ concurrency:
 
 jobs:
   run-tests:
+    # ~2 mins saved vs small
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     name: Traces api facade tests
     steps:
diff --git a/.github/workflows/transaction-exclusion-api-testing.yml b/.github/workflows/transaction-exclusion-api-testing.yml
index 6a706f027..f76f57ca4 100644
--- a/.github/workflows/transaction-exclusion-api-testing.yml
+++ b/.github/workflows/transaction-exclusion-api-testing.yml
@@ -16,6 +16,7 @@ concurrency:
 
 jobs:
   run-tests:
+    # ~1.5 mins saved vs small
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     name: Transaction exclusion api tests
     steps:

From 3e5707fc079259cc1fa07612f3872094eb06fc2d Mon Sep 17 00:00:00 2001
From: kyzooghost <jeffersonzjtang@gmail.com>
Date: Tue, 21 Jan 2025 17:24:23 +1100
Subject: [PATCH 4/4] updated comments for workflows

---
 .github/workflows/bridge-ui-publish.yml   | 1 +
 .github/workflows/coordinator-testing.yml | 3 ++-
 .github/workflows/run-smc-tests.yml       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/bridge-ui-publish.yml b/.github/workflows/bridge-ui-publish.yml
index 70d8c4f09..269b7af06 100644
--- a/.github/workflows/bridge-ui-publish.yml
+++ b/.github/workflows/bridge-ui-publish.yml
@@ -18,6 +18,7 @@ on:
 
 jobs:
   publish:
+    # ~1 min saved vs small
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     env:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/.github/workflows/coordinator-testing.yml b/.github/workflows/coordinator-testing.yml
index 515ea7e09..c3f1a68d2 100644
--- a/.github/workflows/coordinator-testing.yml
+++ b/.github/workflows/coordinator-testing.yml
@@ -26,7 +26,8 @@ jobs:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl
+    # ? Seems to fail more often on xl
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
     name: Coordinator tests
     steps:
       - name: Checkout
diff --git a/.github/workflows/run-smc-tests.yml b/.github/workflows/run-smc-tests.yml
index ce1b727fb..dbb07d838 100644
--- a/.github/workflows/run-smc-tests.yml
+++ b/.github/workflows/run-smc-tests.yml
@@ -31,6 +31,7 @@ env:
 
 jobs:
   run-contract-tests:
+    # ~2 mins saved vs small
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
     name: Run smart contracts tests
     env: