summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-08-12 00:15:02 +0000
committerGitHub <noreply@github.com>2022-08-12 00:15:02 +0000
commitd9a79042524af17c49f5681cfc576d758021808f (patch)
tree01bda71ca8f0d521d445f3af59f5d0df55f0efc1
parenta10078f35c9564950035dfc88cb3a2cd9f3d9be3 (diff)
parent8a63e3e5d9f56ee1745b026945614c65f95a5a25 (diff)
downloadnix-d9a79042524af17c49f5681cfc576d758021808f.zip
Merge #1793
1793: Disable cargo-hack in CI r=rtzoeller a=asomers Serde accidentally raised its MSRV to 1.51.0 in a patch release. They don't intent to fix it. Nix uses Serde via cargo-hack in CI. Disable it so we can publish a final release at 1.46.0. Co-authored-by: Alan Somers <asomers@gmail.com>
-rw-r--r--.cirrus.yml8
1 files changed, 7 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 49f259a1..ff993086 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,6 +11,9 @@ env:
# The MSRV
TOOLCHAIN: 1.46.0
ZFLAGS:
+ # Temporarily disable cargo-hack until we raise the MSRV to 1.51.0 or later.
+ # See https://github.com/nix-rust/nix/pull/1792
+ NOHACK: 1
# Tests that don't require executing the build binaries
build: &BUILD
@@ -64,7 +67,7 @@ task:
- cargo test --target i686-unknown-freebsd
i386_feature_script:
- . $HOME/.cargo/env
- - cargo hack check --each-feature --target i686-unknown-freebsd
+ - if [ -z "$NOHACK" ]; then cargo hack check --each-feature --target i686-unknown-freebsd; fi
before_cache_script: rm -rf $CARGO_HOME/registry/index
# Test macOS x86_64 in a full VM
@@ -92,6 +95,9 @@ task:
PATH: $HOME/.cargo/bin:$PATH
RUSTFLAGS: --cfg qemu -D warnings
TOOL: cross
+ # Cross needs at least 1.51.0 after Serde accidentally raised its MSRV.
+ # And Clippy has too many false positives from 1.51.0 through 1.53.0
+ TOOLCHAIN: 1.54.0
matrix:
- name: Linux arm gnueabi
env: