From 0ca2dba6934f717967a3cc615492d241c936dfb1 Mon Sep 17 00:00:00 2001 From: Victor Larodiel Date: Tue, 10 Nov 2026 22:19:26 -0300 Subject: [PATCH 1/3] The workflow templates run on Blacksmith --- templates/workflows/release-prep.yml | 4 ++-- templates/workflows/release.yml | 2 +- templates/workflows/zip.yml | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/workflows/release-prep.yml b/templates/workflows/release-prep.yml index 33580b2c..c3f06bb3 100644 --- a/templates/workflows/release-prep.yml +++ b/templates/workflows/release-prep.yml @@ -41,8 +41,8 @@ permissions: jobs: prepare: - # pup runs on PHP, which ubuntu-24.04 ships. Pinned so that stays true. - runs-on: ubuntu-24.04 + # pup runs on PHP, which the Ubuntu 24.04 image ships. Pinned so that stays true. + runs-on: blacksmith-2vcpu-ubuntu-2404 permissions: contents: write # the action commits the preparation to the branch steps: diff --git a/templates/workflows/release.yml b/templates/workflows/release.yml index 69864acc..bb9db4b9 100644 --- a/templates/workflows/release.yml +++ b/templates/workflows/release.yml @@ -43,7 +43,7 @@ permissions: jobs: release: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 # A release that reaches users should wait for a person: give this environment required reviewers # in the repository settings, and let its branch policy accept the release branches the dashboard # dispatches on. diff --git a/templates/workflows/zip.yml b/templates/workflows/zip.yml index 7a9c3e2c..4be060b6 100644 --- a/templates/workflows/zip.yml +++ b/templates/workflows/zip.yml @@ -78,9 +78,8 @@ permissions: jobs: zip: - # pup runs on the PHP set up below, which also serves the plugin's own build. Give runs on - # Blacksmith: change the label here. - runs-on: ubuntu-24.04 + # pup runs on the PHP set up below, which also serves the plugin's own build. + runs-on: blacksmith-4vcpu-ubuntu-2404 env: # The secrets context is not available in a step's `if`, so whether the bucket and Slack are # configured is decided here. Without the secrets the zip is still built and attached as an From 97fa7c61167b997309c0323aba8ee4c125ad32b6 Mon Sep 17 00:00:00 2001 From: Victor Larodiel Date: Tue, 10 Nov 2026 22:35:57 -0300 Subject: [PATCH 2/3] Templates: say how to run without Blacksmith --- templates/workflows/release-prep.yml | 1 + templates/workflows/release.yml | 1 + templates/workflows/zip.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/templates/workflows/release-prep.yml b/templates/workflows/release-prep.yml index c3f06bb3..fd869962 100644 --- a/templates/workflows/release-prep.yml +++ b/templates/workflows/release-prep.yml @@ -42,6 +42,7 @@ permissions: jobs: prepare: # pup runs on PHP, which the Ubuntu 24.04 image ships. Pinned so that stays true. + # A repository without Blacksmith changes the label to ubuntu-24.04. runs-on: blacksmith-2vcpu-ubuntu-2404 permissions: contents: write # the action commits the preparation to the branch diff --git a/templates/workflows/release.yml b/templates/workflows/release.yml index bb9db4b9..ef357656 100644 --- a/templates/workflows/release.yml +++ b/templates/workflows/release.yml @@ -43,6 +43,7 @@ permissions: jobs: release: + # A repository without Blacksmith changes the label to ubuntu-24.04. runs-on: blacksmith-4vcpu-ubuntu-2404 # A release that reaches users should wait for a person: give this environment required reviewers # in the repository settings, and let its branch policy accept the release branches the dashboard diff --git a/templates/workflows/zip.yml b/templates/workflows/zip.yml index 4be060b6..00324df4 100644 --- a/templates/workflows/zip.yml +++ b/templates/workflows/zip.yml @@ -79,6 +79,7 @@ permissions: jobs: zip: # pup runs on the PHP set up below, which also serves the plugin's own build. + # A repository without Blacksmith changes the label to ubuntu-24.04. runs-on: blacksmith-4vcpu-ubuntu-2404 env: # The secrets context is not available in a step's `if`, so whether the bucket and Slack are From 6fdb7599ff7c4cdfb08322e249c1de32ff0f33ef Mon Sep 17 00:00:00 2001 From: Victor Larodiel Date: Mon, 16 Nov 2026 14:14:44 -0300 Subject: [PATCH 3/3] Templates take the runner as an input, Blacksmith by default --- templates/workflows/release-prep.yml | 10 +++++++--- templates/workflows/release.yml | 8 ++++++-- templates/workflows/zip.yml | 8 ++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/templates/workflows/release-prep.yml b/templates/workflows/release-prep.yml index fd869962..5876a46d 100644 --- a/templates/workflows/release-prep.yml +++ b/templates/workflows/release-prep.yml @@ -30,6 +30,11 @@ on: required: false type: string default: '' + runs-on: + description: 'Runner label, e.g. ubuntu-24.04 for a repository without Blacksmith' + required: false + type: string + default: blacksmith-2vcpu-ubuntu-2404 # Two preparations of the same branch would both commit on top of the same checkout, and the second # commit would be refused as not a fast-forward. One group per branch makes the second wait for the first. @@ -41,9 +46,8 @@ permissions: jobs: prepare: - # pup runs on PHP, which the Ubuntu 24.04 image ships. Pinned so that stays true. - # A repository without Blacksmith changes the label to ubuntu-24.04. - runs-on: blacksmith-2vcpu-ubuntu-2404 + # pup runs on PHP, which the Ubuntu 24.04 image ships. Keep the runner on that image. + runs-on: ${{ inputs.runs-on }} permissions: contents: write # the action commits the preparation to the branch steps: diff --git a/templates/workflows/release.yml b/templates/workflows/release.yml index ef357656..81e1a85e 100644 --- a/templates/workflows/release.yml +++ b/templates/workflows/release.yml @@ -27,6 +27,11 @@ on: description: 'Version being released, e.g. 4.17.0' required: true type: string + runs-on: + description: 'Runner label, e.g. ubuntu-24.04 for a repository without Blacksmith' + required: false + type: string + default: blacksmith-4vcpu-ubuntu-2404 # One deploy at a time for the whole repository, not one per release. Two releases prepared with the # same version would otherwise merge side by side, and the second would land its changes under a @@ -43,8 +48,7 @@ permissions: jobs: release: - # A repository without Blacksmith changes the label to ubuntu-24.04. - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ${{ inputs.runs-on }} # A release that reaches users should wait for a person: give this environment required reviewers # in the repository settings, and let its branch policy accept the release branches the dashboard # dispatches on. diff --git a/templates/workflows/zip.yml b/templates/workflows/zip.yml index 00324df4..1501f8ee 100644 --- a/templates/workflows/zip.yml +++ b/templates/workflows/zip.yml @@ -68,6 +68,11 @@ on: required: false type: string default: '' + runs_on: + description: 'Runner label, e.g. ubuntu-24.04 for a repository without Blacksmith' + required: false + type: string + default: blacksmith-4vcpu-ubuntu-2404 permissions: contents: read @@ -79,8 +84,7 @@ permissions: jobs: zip: # pup runs on the PHP set up below, which also serves the plugin's own build. - # A repository without Blacksmith changes the label to ubuntu-24.04. - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ${{ inputs.runs_on }} env: # The secrets context is not available in a step's `if`, so whether the bucket and Slack are # configured is decided here. Without the secrets the zip is still built and attached as an