Skip to content

Commit

Permalink
chore: bump ci toolchain and MSRV (#506)
Browse files Browse the repository at this point in the history
* chore: bump ci toolchain and MSRV

* fix clippy on macOS
  • Loading branch information
SteveLauC authored Jul 19, 2023
1 parent 9415d7c commit 0ec0e5a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-and-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
name: CI

env:
RUST_VER: '1.68.0'
RUST_VER: '1.71.0'
CROSS_VER: '0.2.5'
CARGO_NET_RETRY: 3

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ To remedy this, **Topgrade** detects which tools you use and runs the appropriat
Other systems users can either use `cargo install` or the compiled binaries from the release page.
The compiled binaries contain a self-upgrading feature.

Topgrade requires Rust 1.60 or above.
> Currently, Topgrade requires Rust 1.65 or above. In general, Topgrade tracks
> the latest stable toolchain.
## Usage

Expand Down
2 changes: 1 addition & 1 deletion src/steps/os/unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ pub fn run_nix(ctx: &ExecutionContext) -> Result<()> {

#[cfg(target_os = "macos")]
{
if let Ok(..) = require("darwin-rebuild") {
if require("darwin-rebuild").is_ok() {
return Err(SkipStep(String::from(
"Nix-darwin on macOS must be upgraded via darwin-rebuild switch",
))
Expand Down

0 comments on commit 0ec0e5a

Please sign in to comment.