Skip to content

Commit eaecc9b

Browse files
committed
Further split check-msrv steps; let Windows use pwsh again
This commit splits the commands in the steps of the `check-msrv` job definition to be one per step, documenting each step. In 510847b I predicted that it would not make sense to split the steps to one command per step in `msrv.yml`. The change made there of using `bash` even on Windows allowed for experimenting with how the workflow logs look when reorganized in various ways. But in view of other changes -- and to better clarify that two toolchains were installed, but the MSRV toolchain is set default, so it is used by all subsequent operations *except* the `-Zminimal-versions` dependency downgrade that currently requires `nightly` -- it now looks like having one command per step is better after all. When running only one (simple) command per step, the main change in 510847b is no longer needed. That is, this now avoids that problem in the same way it has been avoided in `test-fast` in `ci.yml` since 4f2ab5b (#1559). So this commit also removes `shell: bash` in `msrv.yml` (but keeps the comment clarification in `ci.yml`).
1 parent f10f18d commit eaecc9b

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/msrv.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,16 @@ jobs:
3333
# IMPORTANT: adjust etc/msrv-badge.svg as well
3434
RUST_VERSION: 1.75.0
3535

36-
defaults:
37-
run:
38-
# Use `bash` even in the Windows job, so any failing command fails its step (due to `-e`).
39-
shell: bash
40-
4136
steps:
4237
- uses: actions/checkout@v4
4338
- uses: extractions/setup-just@v3
4439
- name: Set up ${{ env.RUST_VERSION }} (MSRV) and nightly toolchains
45-
run: |
46-
rustup toolchain install ${{ env.RUST_VERSION }} nightly --profile minimal --no-self-update
47-
rustup default ${{ env.RUST_VERSION }}
40+
run: rustup toolchain install ${{ env.RUST_VERSION }} nightly --profile minimal --no-self-update
41+
- name: Set ${{ env.RUST_VERSION }} (MSRV) as default
42+
run: rustup default ${{ env.RUST_VERSION }}
4843
- name: Downgrade locked dependencies to lowest allowed versions
4944
run: |
50-
cargo +nightly update -Zminimal-versions # TODO(msrv): Use non-`-Z` way when available.
45+
# TODO(msrv): Use `cargo update --minimal-versions` when `--minimal-versions` is available.
46+
cargo +nightly update -Zminimal-versions
5147
- name: Run some `cargo check` commands on `gix`
5248
run: just ci-check-msrv

0 commit comments

Comments
 (0)