Skip to content

Commit 56ff68d

Browse files
committed
chore: bump msrv to 1.70
1 parent 227edbf commit 56ff68d

File tree

4 files changed

+41
-30
lines changed

4 files changed

+41
-30
lines changed

.github/workflows/ci.yml

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,40 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
jobs:
19-
msrv:
20-
name: MSRV Verify
21-
runs-on: ubuntu-latest
22-
steps:
23-
- uses: actions/checkout@v4
19+
read_msrv:
20+
name: Read MSRV
21+
uses: actions-rust-lang/msrv/.github/workflows/[email protected]
2422

25-
- name: Install Rust (MSRV)
26-
uses: actions-rust-lang/[email protected]
27-
with:
28-
toolchain: '1.56'
29-
30-
- name: Install cargo-hack
31-
uses: taiki-e/[email protected]
32-
with:
33-
tool: cargo-hack
23+
test:
24+
needs: read_msrv
3425

35-
- name: Generate MSRV lockfile
36-
run: cargo hack --remove-dev-deps generate-lockfile
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
toolchain:
30+
- { name: msrv, version: '${{ needs.read_msrv.outputs.msrv }}' }
31+
- { name: stable, version: stable }
3732

38-
- name: Check
39-
run: cargo check --workspace --all-features
33+
name: Test / ${{ matrix.toolchain.name }}
4034

41-
test:
42-
name: Test
4335
runs-on: ubuntu-latest
36+
4437
steps:
4538
- uses: actions/checkout@v4
4639

47-
- name: Install Rust (stable)
48-
uses: actions-rust-lang/[email protected]
40+
- name: Install Rust (${{ matrix.toolchain.name }})
41+
uses: actions-rust-lang/[email protected]
42+
with:
43+
toolchain: ${{ matrix.toolchain.version }}
44+
45+
- name: Install just, cargo-nextest
46+
uses: taiki-e/[email protected]
47+
with:
48+
tool: just,cargo-nextest
49+
50+
- name: Workaround MSRV issues
51+
if: matrix.toolchain.name == 'msrv'
52+
run: just downgrade-for-msrv
4953

5054
- name: Test
51-
run: cargo test --workspace --all-features
55+
run: just test

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[workspace]
2-
resolver = "3"
2+
resolver = "2"
33
members = ["crates/*"]
44

55
[workspace.package]
66
authors = ["Rob Ede <[email protected]>"]
77
repository = "https://github.com/x52dev/serde-utils"
88
license = "MIT OR Apache-2.0"
99
edition = "2021"
10-
rust-version = "1.56"
10+
rust-version = "1.70"
1111

1212
[workspace.dependencies]
1313

CHANGELOG.md renamed to crates/serde-bool/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Unreleased
44

5+
- Minimum supported Rust version (MSRV) is now 1.70.
6+
57
## 0.1.3
68

79
- No significant changes since `0.1.2`.

justfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,22 @@ msrv_rustup := "+" + msrv
1212
# Check project.
1313
check: && clippy
1414
just --unstable --fmt --check
15-
fd -e=md -e=yml --exec-batch prettier --check
16-
taplo lint
15+
fd --hidden -e=md -e=yml --exec-batch prettier --check
16+
fd --hidden -e=toml --exec-batch taplo format --check
17+
fd --hidden -e=toml --exec-batch taplo lint
1718
cargo +nightly fmt -- --check
1819

1920
# Format project.
2021
fmt:
2122
just --unstable --fmt
22-
fd -e=md -e=yml --exec-batch prettier --write
23-
taplo format
23+
fd --hidden -e=md -e=yml --exec-batch prettier --write
24+
fd --hidden -e=toml --exec-batch taplo format
2425
cargo +nightly fmt
2526

27+
[private]
28+
downgrade-for-msrv:
29+
# no downgrades currently necessary
30+
2631
# Clippy check workspace.
2732
clippy:
2833
cargo clippy --workspace --no-default-features
@@ -37,7 +42,7 @@ test:
3742

3843
# Run workspace test suite using MSRV.
3944
test-msrv:
40-
@just test +1.56.1
45+
@just toolchain={{ msrv_rustup }} test
4146

4247
# Run workspace test suite, capturing coverage.
4348
test-coverage:

0 commit comments

Comments
 (0)