Skip to content

Commit 4aac93f

Browse files
authored
Merge pull request #7 from cuviper/ci-resolver
ci: use the MSRV-aware resolver
2 parents e23a022 + 4c3dba5 commit 4aac93f

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

.github/workflows/ci.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ jobs:
3838

3939
steps:
4040
- uses: actions/checkout@v4
41+
- name: Lock MSRV-compatible dependencies
42+
if: matrix.rust == '1.68.0'
43+
env:
44+
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
45+
# Note that this uses the runner's pre-installed stable cargo
46+
run: cargo generate-lockfile
4147
- uses: dtolnay/rust-toolchain@master
4248
with:
4349
toolchain: ${{ matrix.rust }}
@@ -67,6 +73,12 @@ jobs:
6773

6874
steps:
6975
- uses: actions/checkout@v4
76+
- name: Lock MSRV-compatible dependencies
77+
if: matrix.rust == '1.68.0'
78+
env:
79+
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
80+
# Note that this uses the runner's pre-installed stable cargo
81+
run: cargo generate-lockfile
7082
- uses: dtolnay/rust-toolchain@master
7183
with:
7284
toolchain: ${{ matrix.rust }}
@@ -108,7 +120,10 @@ jobs:
108120
- uses: taiki-e/install-action@v2
109121
with:
110122
tool: cargo-hack
111-
- run: cargo +nightly hack generate-lockfile --remove-dev-deps -Z direct-minimal-versions
123+
- name: Lock minimal direct dependencies
124+
run: cargo +nightly hack generate-lockfile --remove-dev-deps -Z direct-minimal-versions
125+
env:
126+
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
112127
- name: Build (nightly)
113128
run: cargo +nightly build --verbose --all-features
114129
- name: Build (MSRV)

0 commit comments

Comments
 (0)