admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: bump ci toolchain and MSRV (#506)

Browse Source 
* chore: bump ci toolchain and MSRV

* fix clippy on macOS
This commit is contained in:
SteveLauC
2023-07-19 10:54:34 +08:00
committed by GitHub
parent 9415d7c61f
commit 0ec0e5a9dd
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check-and-lint.yaml vendored
View File

@@ -7,7 +7,7 @@ on:
name: CI name: CI
env: env:
RUST_VER: '1.68.0' RUST_VER: '1.71.0'
CROSS_VER: '0.2.5' CROSS_VER: '0.2.5'
CARGO_NET_RETRY: 3 CARGO_NET_RETRY: 3

3
README.md
View File

@@ -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. Other systems users can either use `cargo install` or the compiled binaries from the release page.
The compiled binaries contain a self-upgrading feature. 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 ## Usage

2
src/steps/os/unix.rs
View File

@@ -383,7 +383,7 @@ pub fn run_nix(ctx: &ExecutionContext) -> Result<()> {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
if let Ok(..) = require("darwin-rebuild") { if require("darwin-rebuild").is_ok() {
return Err(SkipStep(String::from( return Err(SkipStep(String::from(
"Nix-darwin on macOS must be upgraded via darwin-rebuild switch", "Nix-darwin on macOS must be upgraded via darwin-rebuild switch",
)) ))