diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2024-04-24 12:32:25 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2024-04-24 12:44:13 +0200 |
| commit | c36d78ed64d005046c0e57e28dee314ae64cb0ce (patch) | |
| tree | 4a49d5c6907558ade13322591bc2fb82cf287d0e /src/ci/github-actions | |
| parent | c59bc9a06ab0de13d96f02616b9476c5426fe54c (diff) | |
| download | rust-c36d78ed64d005046c0e57e28dee314ae64cb0ce.tar.gz rust-c36d78ed64d005046c0e57e28dee314ae64cb0ce.zip | |
Turn CI_ONLY_WHEN_CHANNEL from an environment variable to a job attribute
Diffstat (limited to 'src/ci/github-actions')
| -rwxr-xr-x | src/ci/github-actions/calculate-job-matrix.py | 2 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/ci/github-actions/calculate-job-matrix.py b/src/ci/github-actions/calculate-job-matrix.py index 84c4ee40668..124c22bd979 100755 --- a/src/ci/github-actions/calculate-job-matrix.py +++ b/src/ci/github-actions/calculate-job-matrix.py @@ -95,7 +95,7 @@ def skip_jobs(jobs: List[Dict[str, Any]], channel: str) -> List[Job]: """ Skip CI jobs that are not supposed to be executed on the given `channel`. """ - return [j for j in jobs if j.get("CI_ONLY_WHEN_CHANNEL", channel) == channel] + return [j for j in jobs if j.get("only_on_channel", channel) == channel] def get_github_ctx() -> GitHubCtx: diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 0f5dfaa5785..df6c5d6079d 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -200,24 +200,23 @@ auto: # channel name on the output), and this builder prevents landing # changes that would result in broken builds after a promotion. - image: x86_64-gnu-stable + # Only run this job on the nightly channel. Running this on beta + # could cause failures when `dev: 1` in `stage0.txt`, and running + # this on stable is useless. + only_on_channel: nightly env: IMAGE: x86_64-gnu RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable - # Only run this job on the nightly channel. Running this on beta - # could cause failures when `dev: 1` in `stage0.txt`, and running - # this on stable is useless. - CI_ONLY_WHEN_CHANNEL: nightly <<: *job-linux-4c - image: x86_64-gnu-aux <<: *job-linux-4c - image: x86_64-gnu-integration - env: - # Only run this job on the nightly channel. Fuchsia requires - # nightly features to compile, and this job would fail if - # executed on beta and stable. - CI_ONLY_WHEN_CHANNEL: nightly + # Only run this job on the nightly channel. Fuchsia requires + # nightly features to compile, and this job would fail if + # executed on beta and stable. + only_on_channel: nightly <<: *job-linux-8c - image: x86_64-gnu-debug |