diff --git a/templates/workflows/release-prep.yml b/templates/workflows/release-prep.yml index 33580b2..5876a46 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,8 +46,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. 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 69864ac..81e1a85 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,7 +48,7 @@ permissions: jobs: release: - runs-on: ubuntu-24.04 + 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 7a9c3e2..1501f8e 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 @@ -78,9 +83,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: ${{ 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