Skip to content

Commit 383b9b2

Browse files
cargo update (#112)
Closes #115
1 parent bcde73e commit 383b9b2

File tree

4 files changed

+258
-257
lines changed

4 files changed

+258
-257
lines changed

.github/workflows/rust.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ jobs:
2323
rust:
2424
- stable
2525
- 1.46.0 # lib MSRV
26-
- 1.60.0 # cli MSRV
26+
- 1.64.0 # cli MSRV
2727
include:
2828
- os: ubuntu-latest
2929
rust: stable
3030
lint: 1
3131
- rust: stable
3232
rust-args: --all-features
3333
- rust: 1.46.0
34-
no-lock: 1
35-
- rust: 1.60.0
34+
old-cargo-compat: 1
35+
- rust: 1.64.0
3636
rust-args: --all-features
3737
exclude:
3838
# rust < 1.54 does not work on macos >= 12:
@@ -42,7 +42,7 @@ jobs:
4242
- os: macos-11
4343
rust: stable
4444
- os: macos-11
45-
rust: 1.60.0
45+
rust: 1.64.0
4646
runs-on: ${{ matrix.os }}
4747
steps:
4848
- name: Checkout source
@@ -56,14 +56,20 @@ jobs:
5656

5757
- uses: Swatinem/rust-cache@v1
5858

59-
# If we're testing with Rust < 1.60, cargo won't be able to find
60-
# the clap version specified in Cargo.lock, so remove the lockfile.
61-
# This is safe because applications that only use us as a library will
62-
# also ignore our Cargo.lock.
63-
# https://users.rust-lang.org/t/optional-dependencies-and-msrv/82151
64-
- name: Prune Cargo.lock
65-
if: matrix.no-lock
66-
run: rm Cargo.lock
59+
- name: Compatibility fixes for older versions of cargo
60+
if: matrix.old-cargo-compat
61+
run: |
62+
# If we're testing with Rust < 1.60, cargo won't be able to find
63+
# the clap version specified in Cargo.lock, so remove the lockfile.
64+
# This is safe because applications that only use us as a library
65+
# will also ignore our Cargo.lock.
66+
# https://users.rust-lang.org/t/optional-dependencies-and-msrv/82151
67+
cargo update -p clap --precise 3.2.25
68+
# Downgrade the following crates because they require edition 2021
69+
cargo update -p serde --precise 1.0.156
70+
cargo update -p thiserror --precise 1.0.39
71+
cargo update -p quote --precise 1.0.30
72+
cargo update -p proc-macro2 --precise 1.0.65
6773
6874
- name: cargo test
6975
uses: actions-rs/cargo@v1

0 commit comments

Comments
 (0)