Skip to content

Commit

Permalink
Build tweaks
Browse files Browse the repository at this point in the history
- Update dev-dependencies MSRV to 1.70.0
- Run cargo update to avoid errors using a Cargo.lock from the CI cache
  • Loading branch information
marshallpierce committed Nov 11, 2023
1 parent c18c614 commit c8257a7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ workflows:
# get a nightly or stable toolchain via rustup instead of a mutable docker tag
toolchain_override: [
'__msrv__', # won't add any other toolchains, just uses what's in the docker image
'1.65.0', # minimum needed to build dev-dependencies
'1.70.0', # minimum needed to build dev-dependencies
'stable',
'beta',
'nightly'
Expand Down Expand Up @@ -50,6 +50,12 @@ jobs:
- run:
name: Log rustc version
command: rustc --version
- run:
name: Build main target
# update first to select dependencies appropriate for this toolchain
command: |
cargo update
cargo build
- run:
name: Check formatting
command: |
Expand All @@ -64,9 +70,6 @@ jobs:
rustup component add clippy
cargo clippy --all-targets
fi
- run:
name: Build main target
command: cargo build
- run:
name: Build all targets
command: |
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords = ["base64", "utf8", "encode", "decode", "no_std"]
categories = ["encoding"]
license = "MIT OR Apache-2.0"
edition = "2018"
# dev-dependencies require 1.65, but the main code doesn't
# dev-dependencies require 1.70, but the main code doesn't
# This option was added in 1.56, keep it for when we bump MSRV.
rust-version = "1.48.0"

Expand Down

0 comments on commit c8257a7

Please sign in to comment.