File tree 2 files changed +6
-11
lines changed
2 files changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -93,8 +93,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
93
93
docker --version
94
94
95
95
REGISTRY=ghcr.io
96
- # PR CI runs on rust-lang, but we want to use the cache from rust-lang-ci
97
- REGISTRY_USERNAME=rust-lang-ci
96
+ REGISTRY_USERNAME=${GITHUB_REPOSITORY_OWNER}
98
97
# Tag used to push the final Docker image, so that it can be pulled by e.g. rustup
99
98
IMAGE_TAG=${REGISTRY} /${REGISTRY_USERNAME} /rust-ci:${cksum}
100
99
# Tag used to cache the Docker build
Original file line number Diff line number Diff line change @@ -91,21 +91,17 @@ def find_run_type(ctx: GitHubCtx) -> Optional[WorkflowRunType]:
91
91
if ctx .event_name == "pull_request" :
92
92
return PRRunType ()
93
93
elif ctx .event_name == "push" :
94
- old_bors_try_build = (
95
- ctx .ref in ("refs/heads/try" , "refs/heads/try-perf" ) and
96
- ctx .repository == "rust-lang-ci/rust"
94
+ try_build = ctx .ref in (
95
+ "refs/heads/try" ,
96
+ "refs/heads/try-perf" ,
97
+ "refs/heads/automation/bors/try"
97
98
)
98
- new_bors_try_build = (
99
- ctx .ref == "refs/heads/automation/bors/try" and
100
- ctx .repository == "rust-lang/rust"
101
- )
102
- try_build = old_bors_try_build or new_bors_try_build
103
99
104
100
if try_build :
105
101
jobs = get_custom_jobs (ctx )
106
102
return TryRunType (custom_jobs = jobs )
107
103
108
- if ctx .ref == "refs/heads/auto" and ctx . repository == "rust-lang-ci/rust" :
104
+ if ctx .ref == "refs/heads/auto" :
109
105
return AutoRunType ()
110
106
111
107
return None
You can’t perform that action at this time.
0 commit comments