Skip to content

Commit 8e8ffe2

Browse files
committed
Make runner an input
1 parent 82dc4a8 commit 8e8ffe2

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on:
1717
required: false
1818
type: boolean
1919
default: false
20+
runner:
21+
required: false
22+
type: string
23+
default: 'ubuntu-24.04'
2024

2125
defaults:
2226
run:
@@ -32,7 +36,7 @@ jobs:
3236
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
3337
packages: write # for docker/build-push-action to push to GHCR
3438
id-token: write # for docker/login to login to NGINX registry
35-
runs-on: ${{ github.repository_owner == 'nginx' && (inputs.tag != '' || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
39+
runs-on: ${{ inputs.runner }}
3640
services:
3741
registry:
3842
image: registry:3

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ jobs:
224224
platforms: ${{ matrix.platforms }}
225225
tag: ${{ inputs.release_version || '' }}
226226
dry_run: ${{ inputs.dry_run || false}}
227+
runner: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
227228
permissions:
228229
contents: read # for docker/build-push-action to read repo content
229230
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
@@ -240,6 +241,7 @@ jobs:
240241
platforms: "linux/arm64, linux/amd64"
241242
tag: ${{ inputs.release_version || '' }}
242243
dry_run: ${{ inputs.dry_run || false }}
244+
runner: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
243245
permissions:
244246
contents: read # for docker/build-push-action to read repo content
245247
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results

0 commit comments

Comments
 (0)