Skip to content

Commit 1875672

Browse files
committed
ci: use the MSRV-aware resolver
1 parent dd06e57 commit 1875672

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ jobs:
4343
with:
4444
path: ~/.cargo/registry/index
4545
key: cargo-git-index
46+
- name: Lock MSRV-compatible dependencies
47+
if: matrix.rust == '1.63.0'
48+
env:
49+
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
50+
# Note that this uses the runner's pre-installed stable cargo
51+
run: cargo generate-lockfile
4652
- uses: dtolnay/rust-toolchain@master
4753
with:
4854
toolchain: ${{ matrix.rust }}
49-
- name: Downgrade dependencies
50-
if: matrix.rust == '1.63.0'
51-
run: |
52-
cargo generate-lockfile
53-
cargo update -p hashbrown --precise 0.15.0
5455
- name: Tests
5556
run: |
5657
cargo build --verbose --features "${{ matrix.features }}"
@@ -82,15 +83,16 @@ jobs:
8283
with:
8384
path: ~/.cargo/registry/index
8485
key: cargo-git-index
86+
- name: Lock MSRV-compatible dependencies
87+
if: matrix.rust == '1.63.0'
88+
env:
89+
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
90+
# Note that this uses the runner's pre-installed stable cargo
91+
run: cargo generate-lockfile
8592
- uses: dtolnay/rust-toolchain@master
8693
with:
8794
toolchain: ${{ matrix.rust }}
8895
target: ${{ matrix.target }}
89-
- name: Downgrade dependencies
90-
if: matrix.rust == '1.63.0'
91-
run: |
92-
cargo generate-lockfile
93-
cargo update -p hashbrown --precise 0.15.0
9496
- name: Tests
9597
run: |
9698
cargo build -vv --target=${{ matrix.target }} --no-default-features
@@ -132,7 +134,10 @@ jobs:
132134
- uses: taiki-e/install-action@v2
133135
with:
134136
tool: cargo-hack
135-
- run: cargo +nightly hack generate-lockfile --remove-dev-deps -Z direct-minimal-versions
137+
- name: Lock minimal direct dependencies
138+
run: cargo +nightly hack generate-lockfile --remove-dev-deps -Z direct-minimal-versions
139+
env:
140+
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
136141
- name: Build (nightly)
137142
run: cargo +nightly build --verbose --all-features
138143
- name: Build (MSRV)

0 commit comments

Comments
 (0)