Skip to content

Commit 3c85f77

Browse files
authored
CI: fix minimal-versions resolution (dalek-cryptography#593)
To avoid nightly regressions breaking the build, the CI configuration has been updated to *only* use nightly for resolving Cargo.lock by using `cargo update -Z minimal-versions`. Previously, it was running `cargo check` which would attempt to compile all of the dependencies and the code, which is why the diagnostic bug was triggered. By avoiding any kind of code compilation using nightly we can avoid such regressions in the future. Additionally, the clippy job has been changed to run on the latest stable release (1.73.0) rather than nightly, which will prevent future clippy lints from breaking the build. Instead, they can be addressed when clippy is updated.
1 parent 78a86f1 commit 3c85f77

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

.github/workflows/curve25519-dalek.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,9 @@ jobs:
134134
runs-on: ubuntu-latest
135135
steps:
136136
- uses: actions/checkout@v3
137-
# First run `cargo +nightly -Z minimal-verisons check` in order to get a
138-
# Cargo.lock with the oldest possible deps
137+
# Re-resolve Cargo.lock with minimal versions
139138
- uses: dtolnay/rust-toolchain@nightly
140-
- run: cargo -Z minimal-versions check --no-default-features --features serde
139+
- run: cargo update -Z minimal-versions
141140
# Now check that `cargo build` works with respect to the oldest possible
142141
# deps and the stated MSRV
143142
- uses: dtolnay/rust-toolchain@1.60.0

.github/workflows/ed25519-dalek.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v3
27-
# Now run `cargo +nightly -Z minimal-verisons check` in order to get a
28-
# Cargo.lock with the oldest possible deps
27+
# Re-resolve Cargo.lock with minimal versions
2928
- uses: dtolnay/rust-toolchain@nightly
30-
- run: cargo -Z minimal-versions check --no-default-features --features serde
29+
- run: cargo update -Z minimal-versions
3130
# Now check that `cargo build` works with respect to the oldest possible
3231
# deps and the stated MSRV
3332
- uses: dtolnay/rust-toolchain@1.60.0

.github/workflows/workspace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
runs-on: ubuntu-latest
8686
steps:
8787
- uses: actions/checkout@v3
88-
- uses: dtolnay/rust-toolchain@nightly
88+
- uses: dtolnay/rust-toolchain@1.73.0
8989
with:
9090
components: clippy
9191
- run: cargo clippy --target x86_64-unknown-linux-gnu --all-features

.github/workflows/x25519-dalek.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v3
27-
# Now run `cargo +nightly -Z minimal-verisons check` in order to get a
28-
# Cargo.lock with the oldest possible deps
27+
# Re-resolve Cargo.lock with minimal versions
2928
- uses: dtolnay/rust-toolchain@nightly
30-
- run: cargo -Z minimal-versions check --no-default-features --features serde
29+
- run: cargo update -Z minimal-versions
3130
# Now check that `cargo build` works with respect to the oldest possible
3231
# deps and the stated MSRV
3332
- uses: dtolnay/rust-toolchain@1.60.0

0 commit comments

Comments
 (0)