Skip to content

Commit 7a53ef7

Browse files
authored
Rollup merge of #141280 - Kobzol:docker-rust-lang-cache, r=marcoieni
Use Docker cache from the current repository This is needed to make the cache work after moving CI from the `rust-lang-ci` org to `rust-lang`. Shouldn't be merged until we actually move bors. Context: rust-lang/infra-team#188 r? `@marcoieni`
2 parents af081a4 + eb53032 commit 7a53ef7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/ci/docker/run.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
9797
docker --version
9898

9999
REGISTRY=ghcr.io
100-
# Hardcode username to reuse cache between auto and pr jobs
101-
# FIXME: should be changed after move from rust-lang-ci
102-
REGISTRY_USERNAME=rust-lang-ci
100+
# Default to `rust-lang` to allow reusing the cache for local builds
101+
REGISTRY_USERNAME=${GITHUB_REPOSITORY_OWNER:-rust-lang}
103102
# Tag used to push the final Docker image, so that it can be pulled by e.g. rustup
104103
IMAGE_TAG=${REGISTRY}/${REGISTRY_USERNAME}/rust-ci:${cksum}
105104
# Tag used to cache the Docker build

0 commit comments

Comments
 (0)