Skip to content

Commit 78d57ad

Browse files
ci: Add a nightly_channel job
This job is in preparation for switching most of the CI to operating on the stable channel. We still need some actions to run on the nightly channel so we can test the `unstable` feature and run tests under miri. To that end, move various steps under a single `nightly_channel` job. The job switches to the nightly channel using a new `nightly_toolchain.toml` file, so once we switch the top-level `rust-toolchain.toml` to stable, the new job will remain on nightly.
1 parent 473c9e7 commit 78d57ad

File tree

2 files changed

+20
-23
lines changed

2 files changed

+20
-23
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[toolchain]
2+
channel = "nightly"
3+
targets = ["aarch64-unknown-uefi", "i686-unknown-uefi", "x86_64-unknown-uefi"]

.github/workflows/rust.yml

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ jobs:
7171
- name: Run cargo test (without unstable)
7272
run: cargo xtask test
7373

74-
# At least one unit test, for make_boxed() currently, has different behaviour dependent on
75-
# the unstable feature.
76-
- name: Run cargo test (with unstable)
77-
run: cargo xtask test --unstable
78-
7974
lints:
8075
name: Lints
8176
runs-on: ubuntu-latest
@@ -96,24 +91,9 @@ jobs:
9691
- name: Run cargo doc (without unstable)
9792
run: cargo xtask doc --warnings-as-errors --document-private-items
9893

99-
- name: Run cargo doc (with unstable)
100-
run: cargo xtask doc --warnings-as-errors --document-private-items --unstable
101-
10294
- name: Verify generated code is up-to-date
10395
run: cargo xtask gen-code --check
10496

105-
miri:
106-
name: Run unit tests and doctests under Miri
107-
runs-on: ubuntu-latest
108-
steps:
109-
- name: Checkout sources
110-
uses: actions/checkout@v3
111-
112-
- name: Run miri
113-
run: |
114-
rustup component add miri
115-
cargo xtask miri
116-
11797
# This job tests that the template app builds successfully with the
11898
# released versions of the libraries on crates.io.
11999
#
@@ -173,8 +153,8 @@ jobs:
173153
- name: Build
174154
run: cargo xtask build --feature-permutations
175155

176-
vm_test_unstable:
177-
name: Run uefi-test-runner with `unstable` on x86_64
156+
nightly_channel:
157+
name: Run checks that require the nightly channel
178158
runs-on: ubuntu-latest
179159
steps:
180160
- name: Checkout sources
@@ -185,6 +165,20 @@ jobs:
185165
sudo apt-get update
186166
sudo apt-get install qemu-system-x86 ovmf -y
187167
188-
- name: Run VM tests
168+
- name: Enable nightly toolchain
169+
run: cp .github/workflows/nightly_toolchain.toml rust-toolchain.toml
170+
171+
- name: Run VM tests with the `unstable` feature
189172
run: cargo xtask run --target x86_64 --headless --ci --unstable
190173
timeout-minutes: 4
174+
175+
- name: Run cargo doc with the `unstable` feature
176+
run: cargo xtask doc --warnings-as-errors --document-private-items --unstable
177+
178+
- name: Run tests with the `unstable` feature
179+
run: cargo xtask test --unstable
180+
181+
- name: Run unit tests and doctests under Miri
182+
run: |
183+
rustup component add miri
184+
cargo xtask miri

0 commit comments

Comments
 (0)