diff options
| author | bors <bors@rust-lang.org> | 2024-11-15 08:08:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-15 08:08:11 +0000 |
| commit | f00f68245ebe85960000adaab18c1fe8da104cfe (patch) | |
| tree | 27db68f1f86b5e8142f1bf5882df60962ce7295e /src/ci/docker | |
| parent | 251dc8ad84492c792a7600d8c5fef2ec868a36a7 (diff) | |
| parent | acea108b9079145d4d907be75cef666af401ef11 (diff) | |
| download | rust-f00f68245ebe85960000adaab18c1fe8da104cfe.tar.gz rust-f00f68245ebe85960000adaab18c1fe8da104cfe.zip | |
Auto merge of #132967 - klensy:docker-unite, r=Kobzol
fix REGISTRY_USERNAME to reuse cache between auto and pr jobs see https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/reuse.20.28some.29.20docker.20images.20for.20pr.2Fauto.3F
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/run.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 28487bce482..d554186df4c 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -96,7 +96,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then docker --version REGISTRY=ghcr.io - REGISTRY_USERNAME=${GITHUB_REPOSITORY_OWNER:-rust-lang-ci} + # Hardcode username to reuse cache between auto and pr jobs + # FIXME: should be changed after move from rust-lang-ci + REGISTRY_USERNAME=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 |