From 3e242f52ab9b9db4656d35f4f3136806a87bb07a Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 7 Jul 2026 12:19:11 -0700 Subject: [PATCH 1/2] Rename master to main --- .github/workflows/{master.yaml => main.yaml} | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{master.yaml => main.yaml} (95%) diff --git a/.github/workflows/master.yaml b/.github/workflows/main.yaml similarity index 95% rename from .github/workflows/master.yaml rename to .github/workflows/main.yaml index f6487bf..0ce4f57 100644 --- a/.github/workflows/master.yaml +++ b/.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 diff --git a/README.md b/README.md index aefe368..01c656b 100644 --- a/README.md +++ b/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. From dcaece19c04de6187ea8a77ee7a72f9192dc11a7 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 7 Jul 2026 12:21:56 -0700 Subject: [PATCH 2/2] ci: use the fallback resolver for deps --- ci/test_full.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ci/test_full.sh b/ci/test_full.sh index 57c5ac0..7a8e043 100755 --- a/ci/test_full.sh +++ b/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