From 21009b3687e5608b906c80a35823da003b75555a Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Fri, 3 May 2024 16:47:13 +0200
Subject: [PATCH 01/26] [DNM][ci] Add forklift to GHA ARC

---
 .forklift/config.toml                     | 30 +++++++++++++++++++++++
 .github/workflows/test-github-actions.yml |  4 +--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 .forklift/config.toml

diff --git a/.forklift/config.toml b/.forklift/config.toml
new file mode 100644
index 000000000000..0fa9017d2c56
--- /dev/null
+++ b/.forklift/config.toml
@@ -0,0 +1,30 @@
+[compression]
+  type = "zstd"
+
+  [compression.zstd]
+    compressionLevel = 3
+
+[general]
+  jobNameVariable = "CI_JOB_NAME"
+  jobsBlackList = []
+  logLevel = "warn"
+  threadsCount = 6
+
+[metrics]
+  enabled = false
+#   pushEndpoint = "placeholder"
+
+#   [metrics.extraLabels]
+#     environment = "production"
+#     job_name = "$CI_JOB_NAME"
+#     project_name = "$CI_PROJECT_PATH"
+
+[storage]
+  type = "s3"
+
+  [storage.s3]
+    accessKeyId = "placeholder"
+    bucketName = "placeholder"
+    concurrency = 10
+    endpointUrl = "placeholder"
+    secretAccessKey = "placeholder"
\ No newline at end of file
diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index e35ee0994863..138e92e0e53b 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: script
-        run: WASM_BUILD_NO_COLOR=1 time cargo test -p staging-node-cli --release --locked -- --ignored
+        run: WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
   quick-benchmarks:
     runs-on: arc-runners-polkadot-sdk-beefy
     timeout-minutes: 30
@@ -54,4 +54,4 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: script
-        run: time cargo run --locked --release -p staging-node-cli --bin substrate-node --features runtime-benchmarks -- benchmark pallet --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1 --quiet
+        run: time forklift cargo run --locked --release -p staging-node-cli --bin substrate-node --features runtime-benchmarks -- benchmark pallet --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1 --quiet

From cc45af18b8845a8c3929c6f2d7a7ce27cf45c1e7 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 09:58:35 +0200
Subject: [PATCH 02/26] add forklift vars

---
 .github/workflows/test-github-actions.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 138e92e0e53b..56c3fbe919ac 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -8,6 +8,12 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  FORKLIFT_storage_s3_bucketName: ${{ secrets.FORKLIFT_storage_s3_bucketName }}
+  FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
+  FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
+  FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
+
 jobs:
   set-image:
     # GitHub Actions allows using 'env' in a container context.

From 6c972ebcf4aab69b5305404f0c9fd97dcf2354ff Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 12:49:10 +0200
Subject: [PATCH 03/26] add metric extralabels

---
 .forklift/config.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forklift/config.toml b/.forklift/config.toml
index 0fa9017d2c56..8db0d2255224 100644
--- a/.forklift/config.toml
+++ b/.forklift/config.toml
@@ -14,8 +14,8 @@
   enabled = false
 #   pushEndpoint = "placeholder"
 
-#   [metrics.extraLabels]
-#     environment = "production"
+  [metrics.extraLabels]
+    environment = "production"
 #     job_name = "$CI_JOB_NAME"
 #     project_name = "$CI_PROJECT_PATH"
 

From a0080e0fe54eeaacf01f1b71bb4b7f24bf41ede1 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 13:15:22 +0200
Subject: [PATCH 04/26] format forklift config file

---
 .forklift/config.toml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.forklift/config.toml b/.forklift/config.toml
index 8db0d2255224..4693fb15b43f 100644
--- a/.forklift/config.toml
+++ b/.forklift/config.toml
@@ -1,30 +1,30 @@
 [compression]
-  type = "zstd"
+type = "zstd"
 
-  [compression.zstd]
-    compressionLevel = 3
+[compression.zstd]
+compressionLevel = 3
 
 [general]
-  jobNameVariable = "CI_JOB_NAME"
-  jobsBlackList = []
-  logLevel = "warn"
-  threadsCount = 6
+jobNameVariable = "CI_JOB_NAME"
+jobsBlackList = []
+logLevel = "warn"
+threadsCount = 6
 
 [metrics]
-  enabled = false
+enabled = false
 #   pushEndpoint = "placeholder"
 
-  [metrics.extraLabels]
-    environment = "production"
+[metrics.extraLabels]
+environment = "production"
 #     job_name = "$CI_JOB_NAME"
 #     project_name = "$CI_PROJECT_PATH"
 
 [storage]
-  type = "s3"
+type = "s3"
 
-  [storage.s3]
-    accessKeyId = "placeholder"
-    bucketName = "placeholder"
-    concurrency = 10
-    endpointUrl = "placeholder"
-    secretAccessKey = "placeholder"
\ No newline at end of file
+[storage.s3]
+accessKeyId = "placeholder"
+bucketName = "placeholder"
+concurrency = 10
+endpointUrl = "placeholder"
+secretAccessKey = "placeholder"

From a63ce60c6aeb4062af39a8dbc822390f3188ed5f Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 14:37:07 +0200
Subject: [PATCH 05/26] add sleep for debug

---
 .github/workflows/test-github-actions.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 56c3fbe919ac..eb5f34c268d3 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -44,7 +44,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: script
-        run: WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
+        run: |
+          sleep 1800
+          WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
   quick-benchmarks:
     runs-on: arc-runners-polkadot-sdk-beefy
     timeout-minutes: 30

From 332832d03e6c8e734615baa48d308e272413a007 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 16:31:59 +0200
Subject: [PATCH 06/26] test cache with default role

---
 .github/workflows/test-github-actions.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index eb5f34c268d3..7d3df0607410 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,6 +13,7 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
+  FORKLIFT_general_logLevel: "standard_role_attempt_1"
 
 jobs:
   set-image:
@@ -44,9 +45,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: script
-        run: |
-          sleep 1800
-          WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
+        run: WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
   quick-benchmarks:
     runs-on: arc-runners-polkadot-sdk-beefy
     timeout-minutes: 30

From 7b295b6e3c27b81363c5dfebcbf6deb5326b4182 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 16:37:35 +0200
Subject: [PATCH 07/26] fix suffix

---
 .github/workflows/test-github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 7d3df0607410..94ad08226def 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,7 +13,7 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
-  FORKLIFT_general_logLevel: "standard_role_attempt_1"
+  export FORKLIFT_general_packageSuffix: "standard_role_attempt_1"
 
 jobs:
   set-image:

From 84e41b1334614fe309da568d9d6f11a1db70a726 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 16:38:44 +0200
Subject: [PATCH 08/26] fix action

---
 .github/workflows/test-github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 94ad08226def..4f3cf1428704 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,7 +13,7 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
-  export FORKLIFT_general_packageSuffix: "standard_role_attempt_1"
+  FORKLIFT_general_packageSuffix: "standard_role_attempt_1"
 
 jobs:
   set-image:

From 1ec455f6eb30dceb4c0b42096d0dcbeacd6b35f3 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 16:51:33 +0200
Subject: [PATCH 09/26] test that cache works


From 2420a4f8ba7f49602cc6a83de4faa65c4d4313a8 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 17:05:25 +0200
Subject: [PATCH 10/26] test custom role

---
 .github/workflows/test-github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 4f3cf1428704..ebf2fc9d3ea3 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,7 +13,7 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
-  FORKLIFT_general_packageSuffix: "standard_role_attempt_1"
+  FORKLIFT_general_packageSuffix: "custom_role_attempt_1"
 
 jobs:
   set-image:

From 476e997e1ef84ce16281b9489921dbb856a91290 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 17:22:11 +0200
Subject: [PATCH 11/26] test that cache works 2


From c4c2b40f4dbedfff7f6db4d9212258af91289590 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 20:50:09 +0200
Subject: [PATCH 12/26] test that cache works 3


From 1253dd3af1256a9085238bb1555817601161e1d7 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 21:00:34 +0200
Subject: [PATCH 13/26] check upload with custom role

---
 .github/workflows/test-github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index ebf2fc9d3ea3..ca45cb72608f 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,7 +13,7 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
-  FORKLIFT_general_packageSuffix: "custom_role_attempt_1"
+  FORKLIFT_general_packageSuffix: "custom_role_attempt_2"
 
 jobs:
   set-image:

From 304d2c6f755c32c26913955988100e2cbbc51205 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Mon, 6 May 2024 22:35:32 +0200
Subject: [PATCH 14/26] test that cache works 3


From d826bf8bcd3f58404b9feb8a6cb96d397a2fa4b0 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 09:57:35 +0200
Subject: [PATCH 15/26] set forklift concurrency 1

---
 .github/workflows/test-github-actions.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index ca45cb72608f..1d3f6be364ff 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,7 +13,8 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
-  FORKLIFT_general_packageSuffix: "custom_role_attempt_2"
+  FORKLIFT_general_packageSuffix: "custom_role_attempt_3"
+  FORKLIFT_storage_s3_concurrency: 1
 
 jobs:
   set-image:

From af6b4cca39d12a33a7e22aabee905c96c7dcce0d Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 10:25:18 +0200
Subject: [PATCH 16/26] test that cache works 4


From c594716a1657bd6ae7a0df92900c3dfab9bb292f Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 11:25:51 +0200
Subject: [PATCH 17/26] debug

---
 .github/workflows/test-github-actions.yml | 4 +++-
 .gitlab-ci.yml                            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 1d3f6be364ff..2f05a66a106f 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -46,7 +46,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: script
-        run: WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
+        run: |
+          sleep 1800
+          WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
   quick-benchmarks:
     runs-on: arc-runners-polkadot-sdk-beefy
     timeout-minutes: 30
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e57dd86f141..af0d57486c8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ stages:
   - deploy
   - notify
 
-workflow:
+ workflow:
   rules:
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH

From a095d915b757e3436f3c2c7a8cef80a2477b2316 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 11:44:55 +0200
Subject: [PATCH 18/26] debug trace

---
 .github/workflows/test-github-actions.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 2f05a66a106f..0d941ee0f00a 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,8 +13,9 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
-  FORKLIFT_general_packageSuffix: "custom_role_attempt_3"
+  FORKLIFT_general_packageSuffix: "custom_role_attempt_4"
   FORKLIFT_storage_s3_concurrency: 1
+  FORKLIFT_general_logLevel: "trace"
 
 jobs:
   set-image:
@@ -47,7 +48,6 @@ jobs:
         uses: actions/checkout@v4
       - name: script
         run: |
-          sleep 1800
           WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
   quick-benchmarks:
     runs-on: arc-runners-polkadot-sdk-beefy

From 87c4bb199fbb7041bf563d89bb157844f6e3421d Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 13:14:54 +0200
Subject: [PATCH 19/26] rm tracing

---
 .github/workflows/test-github-actions.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 0d941ee0f00a..c9a01dc819d8 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,9 +13,7 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
-  FORKLIFT_general_packageSuffix: "custom_role_attempt_4"
-  FORKLIFT_storage_s3_concurrency: 1
-  FORKLIFT_general_logLevel: "trace"
+  FORKLIFT_general_packageSuffix: "custom_role_attempt_5"
 
 jobs:
   set-image:

From b46b82f27474d132bb0a48113e0ed5d32ef3b64e Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 13:30:48 +0200
Subject: [PATCH 20/26] test that cache works 5


From c249b90117317f2f87a4c6c0e632a1a5810564a2 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 14:27:11 +0200
Subject: [PATCH 21/26] rm cache prefix, fix gitlab ci

---
 .github/workflows/test-github-actions.yml | 4 +---
 .gitlab-ci.yml                            | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index c9a01dc819d8..56c3fbe919ac 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,7 +13,6 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
-  FORKLIFT_general_packageSuffix: "custom_role_attempt_5"
 
 jobs:
   set-image:
@@ -45,8 +44,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: script
-        run: |
-          WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
+        run: WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored
   quick-benchmarks:
     runs-on: arc-runners-polkadot-sdk-beefy
     timeout-minutes: 30
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af0d57486c8f..5e57dd86f141 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ stages:
   - deploy
   - notify
 
- workflow:
+workflow:
   rules:
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH

From 1951c0fb26414921094decafecb5f0646ec8b9dc Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 14:44:55 +0200
Subject: [PATCH 22/26] fix forklift config

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e57dd86f141..33f1912f92f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,6 +121,8 @@ default:
   before_script:
     - mkdir ~/.forklift
     - cp $FL_FORKLIFT_CONFIG ~/.forklift/config.toml
+    # remove config in the repo
+    - rm -f .forklift/config.toml
     - >
       if [ "$FORKLIFT_BYPASS" != "true" ]; then
         echo "FORKLIFT_BYPASS not set"; 

From 44f259ae7f3df97d8ad784079e3af64611d1edeb Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 7 May 2024 22:03:52 +0200
Subject: [PATCH 23/26] fix forklift config for gitlab

---
 .forklift/config.toml              |  8 ++++----
 .github/workflows/quick-checks.yml | 14 ++++++--------
 .gitlab-ci.yml                     |  6 +++---
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.forklift/config.toml b/.forklift/config.toml
index 4693fb15b43f..403a452aa036 100644
--- a/.forklift/config.toml
+++ b/.forklift/config.toml
@@ -11,13 +11,13 @@ logLevel = "warn"
 threadsCount = 6
 
 [metrics]
-enabled = false
-#   pushEndpoint = "placeholder"
+enabled = true
+pushEndpoint = "placeholder"
 
 [metrics.extraLabels]
 environment = "production"
-#     job_name = "$CI_JOB_NAME"
-#     project_name = "$CI_PROJECT_PATH"
+job_name = "$CI_JOB_NAME"
+project_name = "$CI_PROJECT_PATH"
 
 [storage]
 type = "s3"
diff --git a/.github/workflows/quick-checks.yml b/.github/workflows/quick-checks.yml
index 7bf1983a1f69..a56bf12bb162 100644
--- a/.github/workflows/quick-checks.yml
+++ b/.github/workflows/quick-checks.yml
@@ -14,7 +14,7 @@ jobs:
     # GitHub Actions allows using 'env' in a container context.
     # However, env variables don't work for forks: https://github.com/orgs/community/discussions/44322
     # This workaround sets the container image for each job using 'set-image' job output.
-    runs-on: arc-runners-polkadot-sdk-default
+    runs-on: arc-runners-polkadot-sdk
     timeout-minutes: 10
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}
@@ -24,7 +24,7 @@ jobs:
       - id: set_image
         run: cat .github/env >> $GITHUB_OUTPUT
   fmt:
-    runs-on: arc-runners-polkadot-sdk-default
+    runs-on: arc-runners-polkadot-sdk
     timeout-minutes: 10
     needs: [set-image]
     container:
@@ -34,7 +34,7 @@ jobs:
       - name: Cargo fmt
         run: cargo +nightly fmt --all -- --check
   check-dependency-rules:
-    runs-on: arc-runners-polkadot-sdk-default
+    runs-on: arc-runners-polkadot-sdk
     timeout-minutes: 10
     needs: [set-image]
     container:
@@ -46,8 +46,7 @@ jobs:
           cd substrate/
           ../.gitlab/ensure-deps.sh
   check-rust-feature-propagation:
-    runs-on: arc-runners-polkadot-sdk-default
-    # runs-on: ubuntu-latest
+    runs-on: arc-runners-polkadot-sdk
     timeout-minutes: 10
     needs: [set-image]
     container:
@@ -57,8 +56,7 @@ jobs:
       - name: run zepter
         run: zepter run check
   test-rust-features:
-    runs-on: arc-runners-polkadot-sdk-default
-    # runs-on: ubuntu-latest
+    runs-on: arc-runners-polkadot-sdk
     timeout-minutes: 10
     needs: [set-image]
     container:
@@ -68,7 +66,7 @@ jobs:
       - name: run rust features
         run: bash .gitlab/rust-features.sh .
   check-toml-format:
-    runs-on: arc-runners-polkadot-sdk-default
+    runs-on: arc-runners-polkadot-sdk
     timeout-minutes: 10
     needs: [set-image]
     container:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33f1912f92f2..673474632544 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,10 +119,10 @@ default:
 #
 .forklift-cache:
   before_script:
-    - mkdir ~/.forklift
-    - cp $FL_FORKLIFT_CONFIG ~/.forklift/config.toml
+    # - mkdir ~/.forklift
+    # - cp $FL_FORKLIFT_CONFIG ~/.forklift/config.toml
     # remove config in the repo
-    - rm -f .forklift/config.toml
+    # - rm -f .forklift/config.toml
     - >
       if [ "$FORKLIFT_BYPASS" != "true" ]; then
         echo "FORKLIFT_BYPASS not set"; 

From 72f94c0d6120d98667973a15c9a1f29c30ed5f97 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 8 May 2024 10:20:19 +0200
Subject: [PATCH 24/26] rm forklift config from vars

---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 673474632544..a2d593b0ba7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,10 +119,6 @@ default:
 #
 .forklift-cache:
   before_script:
-    # - mkdir ~/.forklift
-    # - cp $FL_FORKLIFT_CONFIG ~/.forklift/config.toml
-    # remove config in the repo
-    # - rm -f .forklift/config.toml
     - >
       if [ "$FORKLIFT_BYPASS" != "true" ]; then
         echo "FORKLIFT_BYPASS not set"; 

From a201ceb68fc7fb6f3b5b8a6d5a9332b727751052 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 8 May 2024 10:29:45 +0200
Subject: [PATCH 25/26] add forklift config to root homedir

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2d593b0ba7d..73a8c52c448f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,6 +119,8 @@ default:
 #
 .forklift-cache:
   before_script:
+    - mkdir ~/.forklift
+    - cp .forklift/config.toml ~/.forklift/config.toml
     - >
       if [ "$FORKLIFT_BYPASS" != "true" ]; then
         echo "FORKLIFT_BYPASS not set"; 

From 9250cf609731141f99c228827110c06d78bc6213 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 8 May 2024 17:08:38 +0200
Subject: [PATCH 26/26] add pushEndpoint

---
 .github/workflows/test-github-actions.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-github-actions.yml b/.github/workflows/test-github-actions.yml
index 56c3fbe919ac..5dbdb7156d51 100644
--- a/.github/workflows/test-github-actions.yml
+++ b/.github/workflows/test-github-actions.yml
@@ -13,6 +13,7 @@ env:
   FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }}
   FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }}
   FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }}
+  FORKLIFT_metrics_pushEndpoint: ${{ secrets.FORKLIFT_metrics_pushEndpoint }}
 
 jobs:
   set-image: