Skip to content

Commit 3d1424e

Browse files
committed
Clean up and slightly refine the MSRV workflow
- Remove the recently added `macos-15` MSRV check CI job. We don't typically automatically run the MSRV check on macOS CI. That job was temporarily added to help verify that new `justfile` recipes are portable. (They are.) This removes that job. - Show the MSRV in the `check-msrv` "Read the MSRV" step. Show the line being written to set an `MSRV` environment variable for subsequent steps, so it's easy to see the MSRV in the log. - Distinguish MSRV badge changes from unanticipated other changes. In case something goes wrong in the checkout or some other step. - Reword a comment for clarity.
1 parent d48ebdd commit 3d1424e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/msrv.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
os:
2626
- windows-2022
2727
- ubuntu-latest
28-
- macos-15 # FIXME(portability): Remove after testing new justfile changes.
2928

3029
runs-on: ${{ matrix.os }}
3130

@@ -39,7 +38,7 @@ jobs:
3938
- name: Read the MSRV
4039
run: |
4140
msrv="$(just msrv)"
42-
echo "MSRV=$msrv" >> "$GITHUB_ENV"
41+
tee -a "$GITHUB_ENV" <<<"MSRV=$msrv"
4342
- name: Set up MSRV and nightly toolchains
4443
run: |
4544
rustup toolchain install "$MSRV" nightly --profile minimal --no-self-update
@@ -58,12 +57,14 @@ jobs:
5857
steps:
5958
- uses: actions/checkout@v4
6059
- uses: extractions/setup-just@v3
60+
- name: Ensure we start out clean
61+
run: git diff --exit-code
6162
- name: Regenerate the MSRV badge
6263
run: just msrv-badge
6364
- name: Check for changes
6465
run: git diff --exit-code
6566

66-
# Dummy job to have a stable name for the requirement that all MSRV tests pass.
67+
# Dummy job to have a stable name for the requirement that all MSRV checks pass.
6768
msrv-pass:
6869
name: MSRV checks pass
6970

0 commit comments

Comments
 (0)