Skip to content

Commit

Permalink
Merge #1793
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
bors[bot] and asomers authored Aug 12, 2022
2 parents a10078f + 8a63e3e commit d9a7904
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit d9a7904

Please sign in to comment.