diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-12-22 19:01:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-22 19:01:27 +0100 |
| commit | c1263be8ea6910ce5b3b981df377afdd15615ff3 (patch) | |
| tree | 4ad843ecfacef2ade407c757a0927fa538d3332d | |
| parent | 15dc9f5bee8ba12df5545e8cd05215fb24f845ba (diff) | |
| parent | 12b06ad51b6d6c1c3e8169051056716a808eea67 (diff) | |
| download | rust-c1263be8ea6910ce5b3b981df377afdd15615ff3.tar.gz rust-c1263be8ea6910ce5b3b981df377afdd15615ff3.zip | |
Rollup merge of #119194 - pietroalbini:pa-disable-fuchsia-non-nightly, r=tmandry
Run fuchsia tests only on nightly We discovered in https://github.com/rust-lang/rust/pull/119187 that the Fuchsia tests only work on nightly, and so we cannot have the `x86_64-gnu-integration` job run on beta and stable. This PR gates the job to only run in the nightly channel. r? `@tmandry`
| -rw-r--r-- | .github/workflows/ci.yml | 3 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4cf603519b1..540e1eb157e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -289,8 +289,9 @@ jobs: os: ubuntu-20.04-4core-16gb env: {} - name: x86_64-gnu-integration + env: + CI_ONLY_WHEN_CHANNEL: nightly os: ubuntu-20.04-16core-64gb - env: {} - name: x86_64-gnu-debug os: ubuntu-20.04-8core-32gb env: {} diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 800d8920951..3af370bf006 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -471,6 +471,11 @@ jobs: <<: *job-linux-4c - name: 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 <<: *job-linux-16c - name: x86_64-gnu-debug |