Skip to content

Commit

Permalink
Unrolled build for rust-lang#127569
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127569 - Kobzol:ci-fix-docker-local-rebuild, r=nikic

Fix local download of Docker caches from CI

rust-lang#127312 broke local downloads of Docker caches from CI, when you wanted to build a Docker image locally. This PR fixes that.

r? `@nikic`

(Can you please check if the cache works for you with this PR?)
  • Loading branch information
rust-timer authored Jul 10, 2024
2 parents b215beb + e7bd16e commit b768930
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ci/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
docker --version

REGISTRY=ghcr.io
REGISTRY_USERNAME=${GITHUB_REPOSITORY_OWNER}
REGISTRY_USERNAME=${GITHUB_REPOSITORY_OWNER:-rust-lang-ci}
# Tag used to push the final Docker image, so that it can be pulled by e.g. rustup
IMAGE_TAG=${REGISTRY}/${REGISTRY_USERNAME}/rust-ci:${cksum}
# Tag used to cache the Docker build
Expand Down

0 comments on commit b768930

Please sign in to comment.