Skip to content

Commit ee1595c

Browse files
authored
Rollup merge of #143786 - nikic:ci-job-name-fallback, r=marcoieni
Fix fallback for CI_JOB_NAME If CI_JOB_NAME is not specified, it's supposed to fall back to the image name, which is `$image`, not `$IMAGE`. Failing to set the correct CI_JOB_NAME causes failures when running `dist-ohos-*` images locally.
2 parents b4b00c7 + 34426dc commit ee1595c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/ci/docker/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ docker \
361361
--env TOOLSTATE_REPO \
362362
--env TOOLSTATE_PUBLISH \
363363
--env RUST_CI_OVERRIDE_RELEASE_CHANNEL \
364-
--env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \
364+
--env CI_JOB_NAME="${CI_JOB_NAME-$image}" \
365365
--env CI_JOB_DOC_URL="${CI_JOB_DOC_URL}" \
366366
--env BASE_COMMIT="$BASE_COMMIT" \
367367
--env DIST_TRY_BUILD \

0 commit comments

Comments
 (0)