Skip to content

Commit 61840e0

Browse files
phip1611nicholasbishop
authored andcommitted
ci: MSRV fixes
1 parent c54f964 commit 61840e0

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/rust.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,8 @@ jobs:
108108
- name: Checkout sources
109109
uses: actions/checkout@v3
110110

111-
# TODO: for now our latest release (0.19.1) requires nightly.
112-
- name: Set nightly toolchain
113-
run: cp .github/workflows/nightly_toolchain.toml rust-toolchain.toml
111+
- name: Set MSRV toolchain
112+
run: cp .github/workflows/msrv_toolchain.toml rust-toolchain.toml
114113

115114
- name: Build
116115
run: cargo xtask test-latest-release
@@ -129,13 +128,13 @@ jobs:
129128
run: cargo xtask run --target x86_64 --ci
130129
timeout-minutes: 6
131130

132-
# Run the build with our current nightly MSRV (specified in
131+
# Run the build with our current stable MSRV (specified in
133132
# ./msrv_toolchain.toml). This serves to check that we don't
134133
# accidentally start relying on a new feature without intending
135134
# to. Having a test for this makes it easier for us to be intentional
136135
# about making changes that require a newer version.
137136
build_msrv:
138-
name: Check that the build works on our nightly MSRV
137+
name: Check that the build works on our stable MSRV
139138
runs-on: ubuntu-latest
140139
steps:
141140
- name: Checkout sources

xtask/src/main.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ fn run_host_tests(test_opt: &TestOpt) -> Result<()> {
207207
/// The `build` action also builds the template app, but due to the
208208
/// `patch.crates-io` of the top-level Cargo.toml the app is built using
209209
/// the current versions of the libraries in this repo. To give warning
210-
/// when the latest crates.io releases of the libraries are broken (due
211-
/// to changes in the nightly toolchain), this action copies the
212-
/// template to a temporary directory and builds it in isolation.
210+
/// when the latest crates.io releases of the libraries are broken, this
211+
/// action copies the template to a temporary directory and builds it in
212+
/// isolation.
213213
///
214214
/// The build command is also checked against the contents of
215215
/// `building.md` to ensure that the doc correctly describes how to

0 commit comments

Comments
 (0)