Skip to content

Commit

Permalink
Rollup merge of rust-lang#119194 - pietroalbini:pa-disable-fuchsia-no…
Browse files Browse the repository at this point in the history
…n-nightly, r=tmandry

Run fuchsia tests only on nightly

We discovered in rust-lang#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`
  • Loading branch information
matthiaskrgr committed Dec 22, 2023
2 parents 15dc9f5 + 12b06ad commit c1263be
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down
5 changes: 5 additions & 0 deletions src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c1263be

Please sign in to comment.