Skip to content

Commit 5ff1ea7

Browse files
committed
Preserve arm64v8/alpine for arm64 runners
Chain the ternary conditions instead of grouping them so that arm64 runners keep using arm64v8/alpine while IDC runners use the public alpine image.
1 parent 935c866 commit 5ff1ea7

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/linux_job_v2.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,13 +308,13 @@ jobs:
308308
uses: ./test-infra/.github/actions/chown-directory
309309
with:
310310
directory: ${{ github.workspace }}/${{ env.repository }}
311-
ALPINE_IMAGE: ${{ (startsWith(inputs.runner, 'linux.arm64') || startsWith(inputs.runner, 'linux.idc')) && 'alpine' || '308535385114.dkr.ecr.us-east-1.amazonaws.com/tool/alpine' }}
311+
ALPINE_IMAGE: ${{ startsWith(inputs.runner, 'linux.arm64') && 'arm64v8/alpine' || startsWith(inputs.runner, 'linux.idc') && 'alpine' || '308535385114.dkr.ecr.us-east-1.amazonaws.com/tool/alpine' }}
312312

313313
- name: Chown runner temp
314314
uses: ./test-infra/.github/actions/chown-directory
315315
with:
316316
directory: ${{ runner.temp }}
317-
ALPINE_IMAGE: ${{ (startsWith(inputs.runner, 'linux.arm64') || startsWith(inputs.runner, 'linux.idc')) && 'alpine' || '308535385114.dkr.ecr.us-east-1.amazonaws.com/tool/alpine' }}
317+
ALPINE_IMAGE: ${{ startsWith(inputs.runner, 'linux.arm64') && 'arm64v8/alpine' || startsWith(inputs.runner, 'linux.idc') && 'alpine' || '308535385114.dkr.ecr.us-east-1.amazonaws.com/tool/alpine' }}
318318

319319
- name: Prepare artifacts for upload
320320
if: always()

0 commit comments

Comments
 (0)