From c1d593633977ca8be16c65acfb267bb397ec7576 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 11:23:49 +0100
Subject: [PATCH 01/26] first test workflow merge when ready

---
 .github/workflows/merge-when-ready,yml | 58 ++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/merge-when-ready,yml

diff --git a/.github/workflows/merge-when-ready,yml b/.github/workflows/merge-when-ready,yml
new file mode 100644
index 000000000..d69cdbbe5
--- /dev/null
+++ b/.github/workflows/merge-when-ready,yml
@@ -0,0 +1,58 @@
+name: Merge on ready
+on:
+  workflow_run:
+    workflows: [Enforce PR labels, CI]
+    types: [completed]
+  workflow_dispatch:
+    inputs:
+      run_sha:
+        description: "Sha commit from which artifacts are taken"
+        required: true
+
+jobs:
+    e2e-bridge-test:
+        if: ${{ github.event.workflow_run.conclusion == 'success' }} || ${{ github.event_name == 'workflow_dispatch' }}
+        runs-on: self-hosted
+        steps:
+            - name: Retrieve run id
+              id: retrieve-run-id
+              run: |
+                  if [[ -n "${{ github.event_name == 'workflow_dispatch' }}" ]]; then
+                    echo "run_sha=${{ github.event.inputs.run_sha }}" >> $GITHUB_OUTPUT
+                  else
+                    echo "run_sha=${{ github.event.workflow_run.head_sha }}" >> $GITHUB_OUTPUT
+                  fi
+            - name: Recognize sha ref
+              id: sharef
+              run: |
+                if [ ${{ github.event_name }} == 'pull_request' ]
+                then
+                  echo "::set-output name=sha::$(echo ${{github.event.pull_request.head.sha}})"
+                elif [ ${{ github.event_name }} == 'workflow_run' ]
+                then
+                  echo "::set-output name=sha::$(echo ${{github.event.workflow_run.head_sha}})"
+                else
+                  echo "::set-output name=sha::$(echo $GITHUB_SHA)"
+                fi
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Download build artifact from triggered workflow
+              uses: dawidd6/action-download-artifact@v7
+              with:
+                commit: ${{ steps.retrieve-run-id.outputs.run_sha }}
+                workflow: release.yml
+                name: binaries
+                path: target/release
+                allow_forks: false
+              
+            - name: Run Zombienet Test ${{ matrix.test_name }}
+              uses: ./.github/workflow-templates/bridge-e2e
+
+            - name: Commit Action Status
+              uses: LouisBrunner/checks-action@v2.0.0
+              with:
+                sha: ${{ steps.sharef.outputs.sha }}
+                token: ${{ secrets.GITHUB_TOKEN }}
+                name: Merge on ready
+                conclusion: ${{ job.status }}
\ No newline at end of file

From 4f8845c0333c32295c7c934788d1263586d57ab4 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 11:25:26 +0100
Subject: [PATCH 02/26] enfore pr labels

---
 .github/workflows/enforce-pr-labels.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/enforce-pr-labels.yml b/.github/workflows/enforce-pr-labels.yml
index 7f4a84106..ad1d6f18c 100644
--- a/.github/workflows/enforce-pr-labels.yml
+++ b/.github/workflows/enforce-pr-labels.yml
@@ -26,4 +26,12 @@ jobs:
         with:
           REQUIRED_LABELS_ANY: "D1-audited👍,D5-nicetohaveaudit⚠️,D9-needsaudit👮,D2-notlive,D3-trivial"
           REQUIRED_LABELS_ALL: ""
+          BANNED_LABELS: ""
+  enforce-ready-to-merge-label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: yogevbd/enforce-label-action@2.2.2
+        with:
+          REQUIRED_LABELS_ANY: "A8-mergeoncegreen"
+          REQUIRED_LABELS_ALL: ""
           BANNED_LABELS: ""
\ No newline at end of file

From 2d362d692b96e165476501a28b5138b8c4147168 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 11:51:04 +0100
Subject: [PATCH 03/26] try with actions

---
 .github/workflows/merge-when-ready,yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/merge-when-ready,yml b/.github/workflows/merge-when-ready,yml
index d69cdbbe5..26f3b4e05 100644
--- a/.github/workflows/merge-when-ready,yml
+++ b/.github/workflows/merge-when-ready,yml
@@ -36,6 +36,8 @@ jobs:
                 fi
             - name: Checkout
               uses: actions/checkout@v4
+              with:
+                  ref: ${{ steps.retrieve-run-id.outputs.run_sha }}
 
             - name: Download build artifact from triggered workflow
               uses: dawidd6/action-download-artifact@v7

From 106b3ed973fe3931360601f681197a51ee2faf41 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 12:20:18 +0100
Subject: [PATCH 04/26] next try

---
 .github/workflows/merge-when-ready,yml | 60 --------------------------
 .github/workflows/merge-when-ready.yml | 33 ++++++++++++++
 .github/workflows/release.yml          | 22 +++-------
 3 files changed, 38 insertions(+), 77 deletions(-)
 delete mode 100644 .github/workflows/merge-when-ready,yml
 create mode 100644 .github/workflows/merge-when-ready.yml

diff --git a/.github/workflows/merge-when-ready,yml b/.github/workflows/merge-when-ready,yml
deleted file mode 100644
index 26f3b4e05..000000000
--- a/.github/workflows/merge-when-ready,yml
+++ /dev/null
@@ -1,60 +0,0 @@
-name: Merge on ready
-on:
-  workflow_run:
-    workflows: [Enforce PR labels, CI]
-    types: [completed]
-  workflow_dispatch:
-    inputs:
-      run_sha:
-        description: "Sha commit from which artifacts are taken"
-        required: true
-
-jobs:
-    e2e-bridge-test:
-        if: ${{ github.event.workflow_run.conclusion == 'success' }} || ${{ github.event_name == 'workflow_dispatch' }}
-        runs-on: self-hosted
-        steps:
-            - name: Retrieve run id
-              id: retrieve-run-id
-              run: |
-                  if [[ -n "${{ github.event_name == 'workflow_dispatch' }}" ]]; then
-                    echo "run_sha=${{ github.event.inputs.run_sha }}" >> $GITHUB_OUTPUT
-                  else
-                    echo "run_sha=${{ github.event.workflow_run.head_sha }}" >> $GITHUB_OUTPUT
-                  fi
-            - name: Recognize sha ref
-              id: sharef
-              run: |
-                if [ ${{ github.event_name }} == 'pull_request' ]
-                then
-                  echo "::set-output name=sha::$(echo ${{github.event.pull_request.head.sha}})"
-                elif [ ${{ github.event_name }} == 'workflow_run' ]
-                then
-                  echo "::set-output name=sha::$(echo ${{github.event.workflow_run.head_sha}})"
-                else
-                  echo "::set-output name=sha::$(echo $GITHUB_SHA)"
-                fi
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ steps.retrieve-run-id.outputs.run_sha }}
-
-            - name: Download build artifact from triggered workflow
-              uses: dawidd6/action-download-artifact@v7
-              with:
-                commit: ${{ steps.retrieve-run-id.outputs.run_sha }}
-                workflow: release.yml
-                name: binaries
-                path: target/release
-                allow_forks: false
-              
-            - name: Run Zombienet Test ${{ matrix.test_name }}
-              uses: ./.github/workflow-templates/bridge-e2e
-
-            - name: Commit Action Status
-              uses: LouisBrunner/checks-action@v2.0.0
-              with:
-                sha: ${{ steps.sharef.outputs.sha }}
-                token: ${{ secrets.GITHUB_TOKEN }}
-                name: Merge on ready
-                conclusion: ${{ job.status }}
\ No newline at end of file
diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
new file mode 100644
index 000000000..30a720e84
--- /dev/null
+++ b/.github/workflows/merge-when-ready.yml
@@ -0,0 +1,33 @@
+name: Merge on ready
+on:
+  workflow_call:
+    inputs:
+      run_sha:
+        description: "Sha commit from which artifacts are taken"
+        required: true
+  workflow_dispatch:
+    inputs:
+      run_sha:
+        description: "Sha commit from which artifacts are taken"
+        required: true
+
+jobs:
+    e2e-bridge-test:
+        runs-on: self-hosted
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  ref: ${{ inputs.run_sha }}
+
+            - name: Download build artifact from triggered workflow
+              uses: dawidd6/action-download-artifact@v7
+              with:
+                commit: ${{ inputs.run_sha }}
+                workflow: release.yml
+                name: binaries
+                path: target/release
+                allow_forks: false
+              
+            - name: Run Zombienet Test ${{ matrix.test_name }}
+              uses: ./.github/workflow-templates/bridge-e2e
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bff7fef6d..0706d8ccd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -713,8 +713,8 @@ jobs:
             else
               exit 1
             fi
-    zombienet-tests-merge-queue-bridge-e2e:
-        if: ${{ github.event_name == 'merge_group' }}
+    zombienet-tests-bridge-e2e:
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'mergeoncegreen') }}
         runs-on: self-hosted
         needs: ["set-tags", "build"]
         steps:
@@ -722,22 +722,10 @@ jobs:
             uses: actions/checkout@v4
             with:
               ref: ${{ needs.set-tags.outputs.git_ref }}
-          - name: "Download binaries"
-            uses: actions/download-artifact@v4
+          - name: Run Merge when ready
+            uses: ./.github/workflows/merge-when-ready,yml
             with:
-              name: binaries
-              path: target/release
-          - name: "Make binaries executable"
-            shell: bash
-            run: |
-              chmod uog+x target/release/tanssi-node
-              chmod uog+x target/release/tanssi-relay
-              chmod uog+x target/release/tanssi-relay-prepare-worker
-              chmod uog+x target/release/tanssi-relay-execute-worker
-              chmod uog+x target/release/container-chain-simple-node
-              chmod uog+x target/release/container-chain-frontier-node
-          - name: Run Zombienet Test ${{ matrix.test_name }}
-            uses: ./.github/workflow-templates/bridge-e2e
+              run-sha: ${{ needs.set-tags.outputs.git_ref }}
     chopsticks-upgrade-test:
       runs-on:
         labels: ubuntu-latest

From 7e93130644c67ada4855904df0f50b55b7aaba09 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 12:31:22 +0100
Subject: [PATCH 05/26] mfull label

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0706d8ccd..f8043b3d0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -714,7 +714,7 @@ jobs:
               exit 1
             fi
     zombienet-tests-bridge-e2e:
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'mergeoncegreen') }}
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
         runs-on: self-hosted
         needs: ["set-tags", "build"]
         steps:

From 358944d6ae99bb34457dd2064501c4814c2e084b Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 12:34:56 +0100
Subject: [PATCH 06/26] add type

---
 .github/workflows/merge-when-ready.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
index 30a720e84..12f683578 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/workflows/merge-when-ready.yml
@@ -5,6 +5,7 @@ on:
       run_sha:
         description: "Sha commit from which artifacts are taken"
         required: true
+        type: string
   workflow_dispatch:
     inputs:
       run_sha:

From c1401d85994efc755015e4ef4e2f7072211159cc Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 12:40:08 +0100
Subject: [PATCH 07/26] keep trying

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f8043b3d0..66f63a56f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -723,7 +723,7 @@ jobs:
             with:
               ref: ${{ needs.set-tags.outputs.git_ref }}
           - name: Run Merge when ready
-            uses: ./.github/workflows/merge-when-ready,yml
+            uses: ./.github/workflows/merge-when-ready.yml
             with:
               run-sha: ${{ needs.set-tags.outputs.git_ref }}
     chopsticks-upgrade-test:

From f65367fe8a8d998aa0463ed6264517228680ac36 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 12:49:43 +0100
Subject: [PATCH 08/26] trigger once

---
 .github/workflows/merge-when-ready.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
index 12f683578..bceaa4cc0 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/workflows/merge-when-ready.yml
@@ -1,5 +1,6 @@
 name: Merge on ready
 on:
+  push:
   workflow_call:
     inputs:
       run_sha:

From de59d198fa2b649f9092f6bff78d84f2b8557f6d Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 12:59:42 +0100
Subject: [PATCH 09/26] merge on ready into separate folder

---
 .../action.yml}                                       | 11 +++++++++--
 .github/workflows/release.yml                         |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename .github/{workflows/merge-when-ready.yml => merge-on-ready/action.yml} (72%)

diff --git a/.github/workflows/merge-when-ready.yml b/.github/merge-on-ready/action.yml
similarity index 72%
rename from .github/workflows/merge-when-ready.yml
rename to .github/merge-on-ready/action.yml
index bceaa4cc0..f86a17120 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/merge-on-ready/action.yml
@@ -1,6 +1,5 @@
 name: Merge on ready
 on:
-  push:
   workflow_call:
     inputs:
       run_sha:
@@ -32,4 +31,12 @@ jobs:
                 allow_forks: false
               
             - name: Run Zombienet Test ${{ matrix.test_name }}
-              uses: ./.github/workflow-templates/bridge-e2e
\ No newline at end of file
+              uses: ./.github/workflow-templates/bridge-e2e
+
+            - name: Commit Action Status
+              uses: LouisBrunner/checks-action@v2.0.0
+              with:
+                sha: ${{ inputs.run_sha }}
+                token: ${{ secrets.GITHUB_TOKEN }}
+                name: Merge on ready
+                conclusion: ${{ job.status }}
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66f63a56f..d23bd9d03 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -723,7 +723,7 @@ jobs:
             with:
               ref: ${{ needs.set-tags.outputs.git_ref }}
           - name: Run Merge when ready
-            uses: ./.github/workflows/merge-when-ready.yml
+            uses: ./.github/merge-on-ready
             with:
               run-sha: ${{ needs.set-tags.outputs.git_ref }}
     chopsticks-upgrade-test:

From 32b2cde408ea8676841bddb223df4d53401eb49a Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 13:19:05 +0100
Subject: [PATCH 10/26] try again

---
 .github/workflows/release.yml | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d23bd9d03..116dcefda 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -708,13 +708,13 @@ jobs:
       steps:
         - run: |
             result="${{ needs.zombienet-tests-merge-queue.result}}"
-            if [[ $result == "success" || $result == "skipped" ]]; then
+            if [[ $result == "success"]]; then
               exit 0
             else
               exit 1
             fi
     zombienet-tests-bridge-e2e:
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
+        if: ${{ github.event_name == 'pull_request' && ontains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
         runs-on: self-hosted
         needs: ["set-tags", "build"]
         steps:
@@ -722,10 +722,35 @@ jobs:
             uses: actions/checkout@v4
             with:
               ref: ${{ needs.set-tags.outputs.git_ref }}
-          - name: Run Merge when ready
-            uses: ./.github/merge-on-ready
+          - name: "Download binaries"
+            uses: actions/download-artifact@v4
             with:
-              run-sha: ${{ needs.set-tags.outputs.git_ref }}
+              name: binaries
+              path: target/release
+          - name: "Make binaries executable"
+            shell: bash
+            run: |
+              chmod uog+x target/release/tanssi-node
+              chmod uog+x target/release/tanssi-relay
+              chmod uog+x target/release/tanssi-relay-prepare-worker
+              chmod uog+x target/release/tanssi-relay-execute-worker
+              chmod uog+x target/release/container-chain-simple-node
+              chmod uog+x target/release/container-chain-frontier-node
+          - name: Run Zombienet Test ${{ matrix.test_name }}
+            uses: ./.github/workflow-templates/bridge-e2e
+    zombienet-e2e-merge-queue-results:
+      if: ${{ always() }}
+      runs-on: ubuntu-latest
+      name: Results for zombienet-tests-merge-queue
+      needs: [zombienet-tests-bridge-e2e]
+      steps:
+        - run: |
+            result="${{ needs.zombienet-tests-bridge-e2e.result}}"
+            if [[ $result == "success"]]; then
+              exit 0
+            else
+              exit 1
+            fi
     chopsticks-upgrade-test:
       runs-on:
         labels: ubuntu-latest

From 87578cc361b94a31de6ff21387d52a0d0e2b146d Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 14:15:04 +0100
Subject: [PATCH 11/26] delet merge on read

---
 .github/merge-on-ready/action.yml | 42 -------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 .github/merge-on-ready/action.yml

diff --git a/.github/merge-on-ready/action.yml b/.github/merge-on-ready/action.yml
deleted file mode 100644
index f86a17120..000000000
--- a/.github/merge-on-ready/action.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Merge on ready
-on:
-  workflow_call:
-    inputs:
-      run_sha:
-        description: "Sha commit from which artifacts are taken"
-        required: true
-        type: string
-  workflow_dispatch:
-    inputs:
-      run_sha:
-        description: "Sha commit from which artifacts are taken"
-        required: true
-
-jobs:
-    e2e-bridge-test:
-        runs-on: self-hosted
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ inputs.run_sha }}
-
-            - name: Download build artifact from triggered workflow
-              uses: dawidd6/action-download-artifact@v7
-              with:
-                commit: ${{ inputs.run_sha }}
-                workflow: release.yml
-                name: binaries
-                path: target/release
-                allow_forks: false
-              
-            - name: Run Zombienet Test ${{ matrix.test_name }}
-              uses: ./.github/workflow-templates/bridge-e2e
-
-            - name: Commit Action Status
-              uses: LouisBrunner/checks-action@v2.0.0
-              with:
-                sha: ${{ inputs.run_sha }}
-                token: ${{ secrets.GITHUB_TOKEN }}
-                name: Merge on ready
-                conclusion: ${{ job.status }}
\ No newline at end of file

From ea89c1612458e40c7cb0b7b81ab4930fd1ea358f Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 14:35:24 +0100
Subject: [PATCH 12/26] bug

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 116dcefda..e96d049c0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -714,7 +714,7 @@ jobs:
               exit 1
             fi
     zombienet-tests-bridge-e2e:
-        if: ${{ github.event_name == 'pull_request' && ontains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
+        if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
         runs-on: self-hosted
         needs: ["set-tags", "build"]
         steps:

From 743e3825aceef64574350eefc2788992e4b933c2 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 14:46:46 +0100
Subject: [PATCH 13/26] fix

---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e96d049c0..cb55ecdee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -708,7 +708,7 @@ jobs:
       steps:
         - run: |
             result="${{ needs.zombienet-tests-merge-queue.result}}"
-            if [[ $result == "success"]]; then
+            if [[ $result == "success" ]]; then
               exit 0
             else
               exit 1
@@ -741,12 +741,12 @@ jobs:
     zombienet-e2e-merge-queue-results:
       if: ${{ always() }}
       runs-on: ubuntu-latest
-      name: Results for zombienet-tests-merge-queue
+      name: Results for zombienet-tests-merge-queue e2e
       needs: [zombienet-tests-bridge-e2e]
       steps:
         - run: |
             result="${{ needs.zombienet-tests-bridge-e2e.result}}"
-            if [[ $result == "success"]]; then
+            if [[ $result == "success" ]]; then
               exit 0
             else
               exit 1

From 55909167ec69c02d730e7ef0cfc59e943a445ee2 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 15:00:35 +0100
Subject: [PATCH 14/26] add the other tests as well per label

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cb55ecdee..fc9d45fcd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -670,7 +670,7 @@ jobs:
             with:
               test_name: ${{ matrix.test_name }}
     zombienet-tests-merge-queue:
-        if: ${{ github.event_name == 'merge_group' }}
+        if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
         runs-on: self-hosted
         needs: ["set-tags", "build"]
         strategy:

From 829d009299cd42690dbe27f38cc2060db0e47090 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 15:51:23 +0100
Subject: [PATCH 15/26] change some var names

---
 .github/workflows/release.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fc9d45fcd..13df5555c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -669,7 +669,7 @@ jobs:
             uses: ./.github/workflow-templates/zombienet-tests
             with:
               test_name: ${{ matrix.test_name }}
-    zombienet-tests-merge-queue:
+    zombienet-tests-merge-on-ready:
         if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
         runs-on: self-hosted
         needs: ["set-tags", "build"]
@@ -700,20 +700,20 @@ jobs:
             uses: ./.github/workflow-templates/zombienet-tests
             with:
               test_name: ${{ matrix.test_name }}
-    zombienet-merge-queue-results:
+    zombienet-merge-on-ready-queue-results:
       if: ${{ always() }}
       runs-on: ubuntu-latest
-      name: Results for zombienet-tests-merge-queue
-      needs: [zombienet-tests-merge-queue]
+      name: Results for zombienet-tests that run when ready to merge
+      needs: [zombienet-tests-merge-on-ready]
       steps:
         - run: |
-            result="${{ needs.zombienet-tests-merge-queue.result}}"
+            result="${{ needs.zombienet-tests-merge-on-ready.result}}"
             if [[ $result == "success" ]]; then
               exit 0
             else
               exit 1
             fi
-    zombienet-tests-bridge-e2e:
+    zombienet-tests-bridge-e2e-merge-on-ready:
         if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
         runs-on: self-hosted
         needs: ["set-tags", "build"]
@@ -738,14 +738,14 @@ jobs:
               chmod uog+x target/release/container-chain-frontier-node
           - name: Run Zombienet Test ${{ matrix.test_name }}
             uses: ./.github/workflow-templates/bridge-e2e
-    zombienet-e2e-merge-queue-results:
+    zombienet-bridge-e2e-merge-on-ready-results:
       if: ${{ always() }}
       runs-on: ubuntu-latest
-      name: Results for zombienet-tests-merge-queue e2e
-      needs: [zombienet-tests-bridge-e2e]
+      name: Results for zombienet-tests e2e bridge merge when ready
+      needs: [zombienet-tests-bridge-e2e-merge-on-ready]
       steps:
         - run: |
-            result="${{ needs.zombienet-tests-bridge-e2e.result}}"
+            result="${{ needs.zombienet-tests-bridge-e2e-merge-on-ready.result}}"
             if [[ $result == "success" ]]; then
               exit 0
             else

From c764bd9d74d0fadaabc452cd00cef515656d5e2e Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Fri, 14 Feb 2025 16:54:58 +0100
Subject: [PATCH 16/26] Trigger Build


From 78da89cebad6e5a8350e6cb37abf3eada050a14c Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 10:00:20 +0100
Subject: [PATCH 17/26] try again with action that dispatches upon completion

---
 .github/workflows/merge-when-ready.yml | 60 ++++++++++++++++++++++++++
 .github/workflows/release.yml          | 39 +----------------
 2 files changed, 61 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/merge-when-ready.yml

diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
new file mode 100644
index 000000000..e9c7b607c
--- /dev/null
+++ b/.github/workflows/merge-when-ready.yml
@@ -0,0 +1,60 @@
+name: Merge on ready
+on:
+  workflow_run:
+    workflows: [Enforce PR labels, CI]
+    types: [completed]
+  workflow_dispatch:
+    inputs:
+      run_sha:
+        description: "Sha commit from which artifacts are taken"
+        required: true
+
+jobs:
+    e2e-bridge-test:
+        if: ${{ github.event.workflow_run.conclusion == 'success' }} || ${{ github.event_name == 'workflow_dispatch' }}
+        runs-on: self-hosted
+        steps:
+            - name: Retrieve run id
+              id: retrieve-run-id
+              run: |
+                  if [[ -n "${{ github.event_name == 'workflow_dispatch' }}" ]]; then
+                    echo "run_sha=${{ github.event.inputs.run_sha }}" >> $GITHUB_OUTPUT
+                  else
+                    echo "run_sha=${{ github.event.workflow_run.head_sha }}" >> $GITHUB_OUTPUT
+                  fi
+            - name: Recognize sha ref
+              id: sharef
+              run: |
+                if [ ${{ github.event_name }} == 'pull_request' ]
+                then
+                  echo "::set-output name=sha::$(echo ${{github.event.pull_request.head.sha}})"
+                elif [ ${{ github.event_name }} == 'workflow_run' ]
+                then
+                  echo "::set-output name=sha::$(echo ${{github.event.workflow_run.head_sha}})"
+                else
+                  echo "::set-output name=sha::$(echo $GITHUB_SHA)"
+                fi
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  ref: ${{ steps.retrieve-run-id.outputs.run_sha }}
+
+            - name: Download build artifact from triggered workflow
+              uses: dawidd6/action-download-artifact@v7
+              with:
+                commit: ${{ steps.retrieve-run-id.outputs.run_sha }}
+                workflow: release.yml
+                name: binaries
+                path: target/release
+                allow_forks: false
+
+            - name: Run Zombienet Test ${{ matrix.test_name }}
+              uses: ./.github/workflow-templates/bridge-e2e
+
+            - name: Commit Action Status
+              uses: LouisBrunner/checks-action@v2.0.0
+              with:
+                sha: ${{ steps.sharef.outputs.sha }}
+                token: ${{ secrets.GITHUB_TOKEN }}
+                name: Merge on ready
+                conclusion: ${{ job.status }}
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 13df5555c..5e84ba0ab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,6 +2,7 @@ name: CI
 
 on:
     pull_request:
+      types: [ labeled, unlabeled, opened, edited, synchronize ]
     push:
         branches:
             - master
@@ -713,44 +714,6 @@ jobs:
             else
               exit 1
             fi
-    zombienet-tests-bridge-e2e-merge-on-ready:
-        if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
-        runs-on: self-hosted
-        needs: ["set-tags", "build"]
-        steps:
-          - name: Checkout
-            uses: actions/checkout@v4
-            with:
-              ref: ${{ needs.set-tags.outputs.git_ref }}
-          - name: "Download binaries"
-            uses: actions/download-artifact@v4
-            with:
-              name: binaries
-              path: target/release
-          - name: "Make binaries executable"
-            shell: bash
-            run: |
-              chmod uog+x target/release/tanssi-node
-              chmod uog+x target/release/tanssi-relay
-              chmod uog+x target/release/tanssi-relay-prepare-worker
-              chmod uog+x target/release/tanssi-relay-execute-worker
-              chmod uog+x target/release/container-chain-simple-node
-              chmod uog+x target/release/container-chain-frontier-node
-          - name: Run Zombienet Test ${{ matrix.test_name }}
-            uses: ./.github/workflow-templates/bridge-e2e
-    zombienet-bridge-e2e-merge-on-ready-results:
-      if: ${{ always() }}
-      runs-on: ubuntu-latest
-      name: Results for zombienet-tests e2e bridge merge when ready
-      needs: [zombienet-tests-bridge-e2e-merge-on-ready]
-      steps:
-        - run: |
-            result="${{ needs.zombienet-tests-bridge-e2e-merge-on-ready.result}}"
-            if [[ $result == "success" ]]; then
-              exit 0
-            else
-              exit 1
-            fi
     chopsticks-upgrade-test:
       runs-on:
         labels: ubuntu-latest

From 12ec95030ea4f640e03d308e15f7ab93a6ca95e8 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 10:18:00 +0100
Subject: [PATCH 18/26] a few fixes

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5e84ba0ab..0f875b653 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,6 @@ name: CI
 
 on:
     pull_request:
-      types: [ labeled, unlabeled, opened, edited, synchronize ]
     push:
         branches:
             - master
@@ -671,7 +670,7 @@ jobs:
             with:
               test_name: ${{ matrix.test_name }}
     zombienet-tests-merge-on-ready:
-        if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreen') }}
+        if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'A8-mergeoncegreSADen') }}
         runs-on: self-hosted
         needs: ["set-tags", "build"]
         strategy:

From dd8080481acf94bb81f18361bc4e531025732b7c Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 10:36:37 +0100
Subject: [PATCH 19/26] succesful completion

---
 .github/workflows/release.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0f875b653..06ac609f7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -700,19 +700,6 @@ jobs:
             uses: ./.github/workflow-templates/zombienet-tests
             with:
               test_name: ${{ matrix.test_name }}
-    zombienet-merge-on-ready-queue-results:
-      if: ${{ always() }}
-      runs-on: ubuntu-latest
-      name: Results for zombienet-tests that run when ready to merge
-      needs: [zombienet-tests-merge-on-ready]
-      steps:
-        - run: |
-            result="${{ needs.zombienet-tests-merge-on-ready.result}}"
-            if [[ $result == "success" ]]; then
-              exit 0
-            else
-              exit 1
-            fi
     chopsticks-upgrade-test:
       runs-on:
         labels: ubuntu-latest

From ab2732557fd14a7e2a9f230ab80b40cfbeddf7f1 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 11:20:56 +0100
Subject: [PATCH 20/26] try again

---
 .github/workflows/merge-when-ready.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
index e9c7b607c..80f081fbc 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/workflows/merge-when-ready.yml
@@ -1,8 +1,9 @@
 name: Merge on ready
 on:
   workflow_run:
-    workflows: [Enforce PR labels, CI]
-    types: [completed]
+    workflows: ["Enforce PR labels", "CI"]
+    types: 
+      - completed
   workflow_dispatch:
     inputs:
       run_sha:

From 2365f518402e41dc31dce6f290362452a3c03769 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 12:29:57 +0100
Subject: [PATCH 21/26] grant permissions

---
 .github/workflows/merge-when-ready.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
index 80f081fbc..6739705d6 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/workflows/merge-when-ready.yml
@@ -49,6 +49,13 @@ jobs:
                 path: target/release
                 allow_forks: false
 
+            - name: Grant Permissions
+              run: |
+                chmod uog+x target/release/tanssi-node
+                chmod uog+x target/release/tanssi-relay
+                chmod uog+x target/release/tanssi-relay-execute-worker
+                chmod uog+x target/release/tanssi-relay-prepare-worker
+
             - name: Run Zombienet Test ${{ matrix.test_name }}
               uses: ./.github/workflow-templates/bridge-e2e
 

From 5e03e447425e127b93b6fb28cd459ffd88a94bf4 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 13:43:01 +0100
Subject: [PATCH 22/26] try with gh scripts

---
 .github/workflows/merge-when-ready.yml | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
index 6739705d6..29c21d736 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/workflows/merge-when-ready.yml
@@ -57,12 +57,23 @@ jobs:
                 chmod uog+x target/release/tanssi-relay-prepare-worker
 
             - name: Run Zombienet Test ${{ matrix.test_name }}
+              id: e2e-test
               uses: ./.github/workflow-templates/bridge-e2e
-
-            - name: Commit Action Status
-              uses: LouisBrunner/checks-action@v2.0.0
+            
+            - name: Report tests check
+              uses: actions/github-script@v3
               with:
-                sha: ${{ steps.sharef.outputs.sha }}
-                token: ${{ secrets.GITHUB_TOKEN }}
-                name: Merge on ready
-                conclusion: ${{ job.status }}
\ No newline at end of file
+                github-token: ${{ secrets.GITHUB_TOKEN }}
+                script: |
+                  github.checks.create({
+                    name: 'run tests',
+                    head_sha: '${{ steps.sharef.outputs.sha }}',
+                    status: 'completed',
+                    conclusion: '${{ steps.e2e-test.outcome }}',
+                    output: {
+                      title: 'Run tests',
+                      summary: 'Results: ${{ steps.e2e-test.outcome }}'
+                    },
+                    owner: context.repo.owner,
+                    repo: context.repo.repo
+                  })
\ No newline at end of file

From 25b05de361c70fdc34481ee21ee3aa69013cf309 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 15:19:06 +0100
Subject: [PATCH 23/26] try with v6

---
 .github/workflows/merge-when-ready.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
index 29c21d736..76734e33b 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/workflows/merge-when-ready.yml
@@ -61,11 +61,11 @@ jobs:
               uses: ./.github/workflow-templates/bridge-e2e
             
             - name: Report tests check
-              uses: actions/github-script@v3
+              uses: actions/github-script@v6
               with:
                 github-token: ${{ secrets.GITHUB_TOKEN }}
                 script: |
-                  github.checks.create({
+                  github.rest.checks.create({
                     name: 'run tests',
                     head_sha: '${{ steps.sharef.outputs.sha }}',
                     status: 'completed',

From d99f42a979a1097ae2903f49938aa241aa725ea7 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 16:29:51 +0100
Subject: [PATCH 24/26] let's try separating

---
 .github/workflows/merge-when-ready.yml | 143 ++++++++++++++-----------
 1 file changed, 80 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
index 76734e33b..b262f1489 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/workflows/merge-when-ready.yml
@@ -1,79 +1,96 @@
 name: Merge on ready
 on:
-  workflow_run:
-    workflows: ["Enforce PR labels", "CI"]
-    types: 
-      - completed
-  workflow_dispatch:
-    inputs:
-      run_sha:
-        description: "Sha commit from which artifacts are taken"
-        required: true
-
+  pull_request:
+    types: [labeled, unlabeled, opened, edited, synchronize]
 jobs:
-    e2e-bridge-test:
-        if: ${{ github.event.workflow_run.conclusion == 'success' }} || ${{ github.event_name == 'workflow_dispatch' }}
+    enforce-ready-to-merge-label:
+        runs-on: ubuntu-latest
+        steps:
+          - uses: yogevbd/enforce-label-action@2.2.2
+            with:
+              REQUIRED_LABELS_ANY: "A8-mergeoncegreen"
+              REQUIRED_LABELS_ALL: ""
+              BANNED_LABELS: ""
+    
+    build:
         runs-on: self-hosted
+        env:
+          TMP_TARGET: "/tmp/target"
+          CARGO_TARGET_DIR: "target"
+          RUSTC_WRAPPER: "sccache"
+          CARGO_INCREMENTAL: "0"
+          SCCACHE_CACHE_SIZE: "100GB"
+          SCCACHE_GHA_ENABLED: "true"
+        needs: ["enforce-ready-to-merge-label"]
         steps:
-            - name: Retrieve run id
-              id: retrieve-run-id
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  ref: ${{ needs.set-tags.outputs.git_ref }}
+            - name: Run sccache-cache
+              uses: mozilla-actions/sccache-action@v0.0.7
+            - name: Setup Mold Linker
+              shell: bash
               run: |
-                  if [[ -n "${{ github.event_name == 'workflow_dispatch' }}" ]]; then
-                    echo "run_sha=${{ github.event.inputs.run_sha }}" >> $GITHUB_OUTPUT
-                  else
-                    echo "run_sha=${{ github.event.workflow_run.head_sha }}" >> $GITHUB_OUTPUT
+                  if [ -z "$RUSTFLAGS" ]; then
+                      echo "RUSTFLAGS=-C opt-level=3 -D warnings -C linker=clang -C link-arg=-fuse-ld=$(pwd)/mold/bin/mold" >> $GITHUB_ENV
                   fi
-            - name: Recognize sha ref
-              id: sharef
+                  mkdir -p mold
+                  curl -L --retry 10 --silent --show-error https://github.com/rui314/mold/releases/download/v2.30.0/mold-2.30.0-$(uname -m)-linux.tar.gz | tar -C $(realpath mold) --strip-components=1 -xzf -
+            - name: Setup Rust toolchain
+              run: rustup show
+            - name: Build
+              run: cargo build --features=fast-runtime --release --all
+            - name: Save runtime wasm
+              run: |
+                  mkdir -p runtimes
+                  cp $CARGO_TARGET_DIR/release/wbuild/container-chain-template-simple-runtime/container_chain_template_simple_runtime.compact.compressed.wasm runtimes/;
+                  cp $CARGO_TARGET_DIR/release/wbuild/container-chain-template-frontier-runtime/container_chain_template_frontier_runtime.compact.compressed.wasm runtimes/;
+                  cp $CARGO_TARGET_DIR/release/wbuild/dancebox-runtime/dancebox_runtime.compact.compressed.wasm runtimes/;
+                  cp $CARGO_TARGET_DIR/release/wbuild/flashbox-runtime/flashbox_runtime.compact.compressed.wasm runtimes/;
+                  cp $CARGO_TARGET_DIR/release/wbuild/dancelight-runtime/dancelight_runtime.compact.compressed.wasm runtimes/;
+            - name: Upload runtimes
+              uses: actions/upload-artifact@v4
+              with:
+                  name: runtimes
+                  path: runtimes
+            - name: Save tanssi and template binaries
               run: |
-                if [ ${{ github.event_name }} == 'pull_request' ]
-                then
-                  echo "::set-output name=sha::$(echo ${{github.event.pull_request.head.sha}})"
-                elif [ ${{ github.event_name }} == 'workflow_run' ]
-                then
-                  echo "::set-output name=sha::$(echo ${{github.event.workflow_run.head_sha}})"
-                else
-                  echo "::set-output name=sha::$(echo $GITHUB_SHA)"
-                fi
+                  mkdir -p binaries
+                  cp $CARGO_TARGET_DIR/release/tanssi-node binaries/tanssi-node;
+                  cp $CARGO_TARGET_DIR/release/tanssi-relay binaries/tanssi-relay;
+                  cp $CARGO_TARGET_DIR/release/tanssi-relay-prepare-worker binaries/tanssi-relay-prepare-worker;
+                  cp $CARGO_TARGET_DIR/release/tanssi-relay-execute-worker binaries/tanssi-relay-execute-worker;
+                  cp $CARGO_TARGET_DIR/release/container-chain-frontier-node binaries/container-chain-frontier-node;
+                  cp $CARGO_TARGET_DIR/release/container-chain-simple-node binaries/container-chain-simple-node;
+            - name: Upload binary
+              uses: actions/upload-artifact@v4
+              with:
+                  name: binaries
+                  path: binaries
+    e2e-bridge-test:
+        needs: ["enforce-ready-to-merge-label", "build"]
+        runs-on: self-hosted
+        steps:
             - name: Checkout
               uses: actions/checkout@v4
               with:
-                  ref: ${{ steps.retrieve-run-id.outputs.run_sha }}
-
-            - name: Download build artifact from triggered workflow
-              uses: dawidd6/action-download-artifact@v7
+                  ref: ${{ github.head_ref }}
+            - name: "Download binaries"
+              uses: actions/download-artifact@v4
               with:
-                commit: ${{ steps.retrieve-run-id.outputs.run_sha }}
-                workflow: release.yml
-                name: binaries
-                path: target/release
-                allow_forks: false
-
-            - name: Grant Permissions
+                  name: binaries
+                  path: target/release
+            - name: "Make binaries executable"
+              shell: bash
               run: |
-                chmod uog+x target/release/tanssi-node
-                chmod uog+x target/release/tanssi-relay
-                chmod uog+x target/release/tanssi-relay-execute-worker
-                chmod uog+x target/release/tanssi-relay-prepare-worker
+                  chmod uog+x target/release/tanssi-node
+                  chmod uog+x target/release/tanssi-relay
+                  chmod uog+x target/release/tanssi-relay-prepare-worker
+                  chmod uog+x target/release/tanssi-relay-execute-worker
+                  chmod uog+x target/release/container-chain-simple-node
+                  chmod uog+x target/release/container-chain-frontier-node
 
             - name: Run Zombienet Test ${{ matrix.test_name }}
               id: e2e-test
-              uses: ./.github/workflow-templates/bridge-e2e
-            
-            - name: Report tests check
-              uses: actions/github-script@v6
-              with:
-                github-token: ${{ secrets.GITHUB_TOKEN }}
-                script: |
-                  github.rest.checks.create({
-                    name: 'run tests',
-                    head_sha: '${{ steps.sharef.outputs.sha }}',
-                    status: 'completed',
-                    conclusion: '${{ steps.e2e-test.outcome }}',
-                    output: {
-                      title: 'Run tests',
-                      summary: 'Results: ${{ steps.e2e-test.outcome }}'
-                    },
-                    owner: context.repo.owner,
-                    repo: context.repo.repo
-                  })
\ No newline at end of file
+              uses: ./.github/workflow-templates/bridge-e2e
\ No newline at end of file

From 6b38f9fb752ffc28a727d31de9d62ffeb9077aea Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 17:07:59 +0100
Subject: [PATCH 25/26] refactor

---
 .github/workflows/enforce-pr-labels.yml |  8 ---
 .github/workflows/merge-when-ready.yml  | 34 +++++++++++
 .github/workflows/release.yml           | 76 -------------------------
 3 files changed, 34 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/enforce-pr-labels.yml b/.github/workflows/enforce-pr-labels.yml
index ad1d6f18c..7f4a84106 100644
--- a/.github/workflows/enforce-pr-labels.yml
+++ b/.github/workflows/enforce-pr-labels.yml
@@ -26,12 +26,4 @@ jobs:
         with:
           REQUIRED_LABELS_ANY: "D1-audited👍,D5-nicetohaveaudit⚠️,D9-needsaudit👮,D2-notlive,D3-trivial"
           REQUIRED_LABELS_ALL: ""
-          BANNED_LABELS: ""
-  enforce-ready-to-merge-label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: yogevbd/enforce-label-action@2.2.2
-        with:
-          REQUIRED_LABELS_ANY: "A8-mergeoncegreen"
-          REQUIRED_LABELS_ALL: ""
           BANNED_LABELS: ""
\ No newline at end of file
diff --git a/.github/workflows/merge-when-ready.yml b/.github/workflows/merge-when-ready.yml
index b262f1489..1049ce6b8 100644
--- a/.github/workflows/merge-when-ready.yml
+++ b/.github/workflows/merge-when-ready.yml
@@ -68,6 +68,40 @@ jobs:
               with:
                   name: binaries
                   path: binaries
+    zombienet-tests-ready-to-merge:
+        needs: ["enforce-ready-to-merge-label", "build"]
+        runs-on: self-hosted   
+        strategy:
+            fail-fast: false
+            matrix:
+                test_name:
+                    - zombie_tanssi_warp_sync
+                    - zombie_data_preservers
+                    - zombie_tanssi_parathreads
+                    - zombie_tanssi_rotation
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  ref: ${{ github.head_ref }}
+            - name: "Download binaries"
+              uses: actions/download-artifact@v4
+              with:
+                  name: binaries
+                  path: target/release
+            - name: "Make binaries executable"
+              shell: bash
+              run: |
+                  chmod uog+x target/release/tanssi-node
+                  chmod uog+x target/release/tanssi-relay
+                  chmod uog+x target/release/tanssi-relay-prepare-worker
+                  chmod uog+x target/release/tanssi-relay-execute-worker
+                  chmod uog+x target/release/container-chain-simple-node
+                  chmod uog+x target/release/container-chain-frontier-node
+            - name: Run Zombienet Test ${{ matrix.test_name }}
+              uses: ./.github/workflow-templates/zombienet-tests
+              with:
+                  test_name: ${{ matrix.test_name }}
     e2e-bridge-test:
         needs: ["enforce-ready-to-merge-label", "build"]
         runs-on: self-hosted
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 274623d4e..3800ba97d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -668,82 +668,6 @@ jobs:
               with:
                   test_name: ${{ matrix.test_name }}
 
-    zombienet-tests-merge-queue:
-        if: ${{ github.event_name == 'merge_group' }}
-        runs-on: self-hosted
-        needs: ["set-tags", "build"]
-        strategy:
-            fail-fast: false
-            matrix:
-                test_name:
-                    - zombie_tanssi_warp_sync
-                    - zombie_data_preservers
-                    - zombie_tanssi_parathreads
-                    - zombie_tanssi_rotation
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ needs.set-tags.outputs.git_ref }}
-            - name: "Download binaries"
-              uses: actions/download-artifact@v4
-              with:
-                  name: binaries
-                  path: target/release
-            - name: "Make binaries executable"
-              shell: bash
-              run: |
-                  chmod uog+x target/release/tanssi-node
-                  chmod uog+x target/release/tanssi-relay
-                  chmod uog+x target/release/tanssi-relay-prepare-worker
-                  chmod uog+x target/release/tanssi-relay-execute-worker
-                  chmod uog+x target/release/container-chain-simple-node
-                  chmod uog+x target/release/container-chain-frontier-node
-            - name: Run Zombienet Test ${{ matrix.test_name }}
-              uses: ./.github/workflow-templates/zombienet-tests
-              with:
-                  test_name: ${{ matrix.test_name }}
-
-    zombienet-merge-queue-results:
-        if: ${{ always() }}
-        runs-on: ubuntu-latest
-        name: Results for zombienet-tests-merge-queue
-        needs: [zombienet-tests-merge-queue]
-        steps:
-            - run: |
-                  result="${{ needs.zombienet-tests-merge-queue.result}}"
-                  if [[ $result == "success" || $result == "skipped" ]]; then
-                      exit 0
-                  else
-                      exit 1
-                  fi
-
-    zombienet-tests-merge-queue-bridge-e2e:
-        if: ${{ github.event_name == 'merge_group' }}
-        runs-on: self-hosted
-        needs: ["set-tags", "build"]
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ needs.set-tags.outputs.git_ref }}
-            - name: "Download binaries"
-              uses: actions/download-artifact@v4
-              with:
-                  name: binaries
-                  path: target/release
-            - name: "Make binaries executable"
-              shell: bash
-              run: |
-                  chmod uog+x target/release/tanssi-node
-                  chmod uog+x target/release/tanssi-relay
-                  chmod uog+x target/release/tanssi-relay-prepare-worker
-                  chmod uog+x target/release/tanssi-relay-execute-worker
-                  chmod uog+x target/release/container-chain-simple-node
-                  chmod uog+x target/release/container-chain-frontier-node
-            - name: Run Zombienet Test ${{ matrix.test_name }}
-              uses: ./.github/workflow-templates/bridge-e2e
-
     chopsticks-upgrade-test:
         runs-on:
             labels: ubuntu-latest

From dd9325496369114d94397c93f06a96070b5e9581 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 17 Feb 2025 17:09:13 +0100
Subject: [PATCH 26/26] merge on ready

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

diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
index 6e5d0f811..b1db5e808 100644
--- a/.github/workflows/cancel.yml
+++ b/.github/workflows/cancel.yml
@@ -9,6 +9,6 @@ jobs:
     steps:
       - uses: styfle/cancel-workflow-action@0.9.1
         with:
-          workflow_id: ".github/workflows/release.yml,.github/workflows/coverage.yml,.github/workflows/docker-runtime-draft.yml"
+          workflow_id: ".github/workflows/release.yml,.github/workflows/coverage.yml,.github/workflows/docker-runtime-draft.yml,.github/workflows/merge-when-ready.yml"
           all_but_latest: true
           access_token: ${{ github.token }}