From 5298eac9d5b9711c263bf136c52927b154283a3f Mon Sep 17 00:00:00 2001
From: Bruno Devic <bruno.devic@parity.io>
Date: Fri, 12 Dec 2025 16:05:01 +0100
Subject: [PATCH 1/2] chore: revert runners change

---
 .../release-30_publish_release_draft.yml       |  2 +-
 .../workflows/release-reusable-rc-build.yml    | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release-30_publish_release_draft.yml b/.github/workflows/release-30_publish_release_draft.yml
index 024481cfa6814..92ed63df82318 100644
--- a/.github/workflows/release-30_publish_release_draft.yml
+++ b/.github/workflows/release-30_publish_release_draft.yml
@@ -205,7 +205,7 @@ jobs:
           GITHUB_TOKEN: ${{ steps.generate_write_token.outputs.token }}
         run: |
           mkdir -p ${{ github.workspace}}/runtimes/
-          gh run download ${{ inputs.build_run_id }} --dir ${{ github.workspace}}/runtimes
+          gh run download ${{ github.event.inputs.build_run_id }} --dir ${{ github.workspace}}/runtimes
           ls -la ${{ github.workspace}}/runtimes
 
       - name: Get runtime info
diff --git a/.github/workflows/release-reusable-rc-build.yml b/.github/workflows/release-reusable-rc-build.yml
index c480d3d83385a..59409fd877b6d 100644
--- a/.github/workflows/release-reusable-rc-build.yml
+++ b/.github/workflows/release-reusable-rc-build.yml
@@ -42,32 +42,20 @@ jobs:
     # 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: ubuntu-latest
-    env:
-      BINARY: ${{ inputs.binary }}
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}
-      RUNNER: ${{ steps.set_image.outputs.RUNNER }}
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - id: set_image
-        run: |
-          cat .github/env >> $GITHUB_OUTPUT
-          RUNNER=""
-          if [[ "${BINARY}" =~ "polkadot-parachain" || "${BINARY}" =~ "polkadot-omni-node" ]]; then
-            RUNNER="ubuntu-latest-m"
-            echo "Using ubuntu-latest-m runner"
-          else
-            RUNNER="ubuntu-latest"
-            echo "Using ubuntu-latest runner"
-          fi
-          echo "RUNNER=${RUNNER}" >> $GITHUB_OUTPUT
+        run: cat .github/env >> $GITHUB_OUTPUT
+        
 
   build-rc:
     if: ${{ inputs.target == 'x86_64-unknown-linux-gnu' }}
     needs: [set-image]
-    runs-on: ${{ needs.set-image.outputs.RUNNER }}
+    runs-on: ubuntu-latest-m
     environment: release
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}

From d9d5ac63083d6b645a5551c83bc64cb3c517bbbd Mon Sep 17 00:00:00 2001
From: Egor_P <egor@parity.io>
Date: Tue, 16 Dec 2025 10:37:07 +0100
Subject: [PATCH 2/2] Fix variable reference in download command

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

diff --git a/.github/workflows/release-30_publish_release_draft.yml b/.github/workflows/release-30_publish_release_draft.yml
index 629be166ed0e2..abb706c3ebaa0 100644
--- a/.github/workflows/release-30_publish_release_draft.yml
+++ b/.github/workflows/release-30_publish_release_draft.yml
@@ -205,7 +205,7 @@ jobs:
           GITHUB_TOKEN: ${{ steps.generate_write_token.outputs.token }}
         run: |
           mkdir -p ${{ github.workspace}}/runtimes/
-          gh run download ${{ github.event.inputs.build_run_id }} --dir ${{ github.workspace}}/runtimes
+          gh run download ${{ inputs.build_run_id }} --dir ${{ github.workspace}}/runtimes
           ls -la ${{ github.workspace}}/runtimes
 
       - name: Get runtime info