Rename master to main

.github/workflows/master.yaml → .github/workflows/main.yaml

@@ -1,8 +1,8 @@
-name: master
+name: main
 on:
   push:
     branches:
-      - master
+      - main
   schedule:
     - cron: '0 0 * * 0' # 00:00 Sunday
 

README.md

@@ -3,7 +3,7 @@
 [![crate](https://img.shields.io/crates/v/num-integer.svg)](https://crates.io/crates/num-integer)
 [![documentation](https://docs.rs/num-integer/badge.svg)](https://docs.rs/num-integer)
 [![minimum rustc 1.31](https://img.shields.io/badge/rustc-1.31+-red.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
-[![build status](https://github.com/rust-num/num-integer/workflows/master/badge.svg)](https://github.com/rust-num/num-integer/actions)
+[![build status](https://github.com/rust-num/num-integer/actions/workflows/main.yaml/badge.svg)](https://github.com/rust-num/num-integer/actions/workflows/main.yaml)
 
 `Integer` trait and functions for Rust.
 

ci/test_full.sh

@@ -21,6 +21,14 @@ check_version() {
   ]]
 }
 
+export CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS=fallback
+generate_lockfile() {
+  cargo generate-lockfile
+  if ! check_version 1.85 ; then
+    cargo +stable update
+  fi
+}
+
 echo "Testing $CRATE on rustc $RUST_VERSION"
 if ! check_version $MSRV ; then
   echo "The minimum for $CRATE is rustc $MSRV"
@@ -30,11 +38,7 @@ fi
 FEATURES=()
 echo "Testing supported features: ${FEATURES[*]}"
 
-cargo generate-lockfile
-
-# num-traits 0.2.19 started using dep: features, which requires 1.60 and is
-# otherwise ignored down to 1.51, but we need a manual downgrade before that.
-check_version 1.51 || cargo update -p num-traits --precise 0.2.18
+generate_lockfile
 
 set -x