Skip to content

Commit d9a7904

Browse files
bors[bot]asomers
andauthored
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>
2 parents a10078f + 8a63e3e commit d9a7904

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.cirrus.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ env:
1111
# The MSRV
1212
TOOLCHAIN: 1.46.0
1313
ZFLAGS:
14+
# Temporarily disable cargo-hack until we raise the MSRV to 1.51.0 or later.
15+
# See https://github.com/nix-rust/nix/pull/1792
16+
NOHACK: 1
1417

1518
# Tests that don't require executing the build binaries
1619
build: &BUILD
@@ -64,7 +67,7 @@ task:
6467
- cargo test --target i686-unknown-freebsd
6568
i386_feature_script:
6669
- . $HOME/.cargo/env
67-
- cargo hack check --each-feature --target i686-unknown-freebsd
70+
- if [ -z "$NOHACK" ]; then cargo hack check --each-feature --target i686-unknown-freebsd; fi
6871
before_cache_script: rm -rf $CARGO_HOME/registry/index
6972

7073
# Test macOS x86_64 in a full VM
@@ -92,6 +95,9 @@ task:
9295
PATH: $HOME/.cargo/bin:$PATH
9396
RUSTFLAGS: --cfg qemu -D warnings
9497
TOOL: cross
98+
# Cross needs at least 1.51.0 after Serde accidentally raised its MSRV.
99+
# And Clippy has too many false positives from 1.51.0 through 1.53.0
100+
TOOLCHAIN: 1.54.0
95101
matrix:
96102
- name: Linux arm gnueabi
97103
env:

0 commit comments

Comments
 (0)