Skip to content

Commit 9145678

Browse files
committed
Update
[ghstack-poisoned]
2 parents 4314648 + c64d7b2 commit 9145678

1 file changed

Lines changed: 19 additions & 4 deletions

File tree

.github/workflows/linux_job_v2.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ jobs:
137137
# Will be blank outside of this
138138
PR_NUMBER: ${{ github.event.pull_request.number }}
139139
SCRIPT: ${{ inputs.script }}
140+
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' }}
140141
filter: ${{ inputs.checkout-mode == 'blobless' && 'blob:none' || inputs.checkout-mode == 'treeless' && 'tree:0' || null }}
141142
runs-on: ${{ inputs.runner }}
142143
# TODO: Eventually this should run in a container, we need to make a container that matches up
@@ -311,13 +312,27 @@ jobs:
311312
uses: ./test-infra/.github/actions/chown-directory
312313
with:
313314
directory: ${{ github.workspace }}/${{ env.repository }}
314-
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' }}
315+
ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
315316

316-
- name: Chown runner temp
317+
# Not all of ${RUNNER_TEMP} — a container-issued chown lands on a subordinate
318+
# UID under rootless docker, locking the runner out of _github_workflow/.
319+
- name: Chown runner artifacts dir
317320
uses: ./test-infra/.github/actions/chown-directory
318321
with:
319-
directory: ${{ runner.temp }}
320-
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' }}
322+
directory: ${{ env.RUNNER_ARTIFACT_DIR }}
323+
ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
324+
325+
- name: Chown runner docs dir
326+
uses: ./test-infra/.github/actions/chown-directory
327+
with:
328+
directory: ${{ env.RUNNER_DOCS_DIR }}
329+
ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
330+
331+
- name: Chown runner test results dir
332+
uses: ./test-infra/.github/actions/chown-directory
333+
with:
334+
directory: ${{ env.RUNNER_TEST_RESULTS_DIR }}
335+
ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
321336

322337
- name: Prepare artifacts for upload
323338
if: always()

0 commit comments

Comments
 (0)