Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Pin nightly compiler used in CI for uclibc" #1699

Merged
merged 1 commit into from
May 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -286,29 +286,14 @@ task:
- name: OpenBSD x86_64
env:
TARGET: x86_64-unknown-openbsd
- name: Linux armv7 uclibceabihf
env:
TARGET: armv7-unknown-linux-uclibceabihf
setup_script:
- rustup component add rust-src
<< : *BUILD
before_cache_script: rm -rf $CARGO_HOME/registry/index

# uclibc needs its own task for now, due to Rust bug 95866
# https://github.com/rust-lang/rust/issues/95866
task:
name: Linux armv7 uclibceabihf
container:
image: rustlang/rust:nightly
env:
BUILD: check
ZFLAGS: -Zbuild-std
TARGET: armv7-unknown-linux-uclibceabihf
TOOLCHAIN: nightly-2022-04-01
setup_script:
- rustup toolchain install $TOOLCHAIN --profile minimal
- rustup component add --toolchain $TOOLCHAIN rust-src
- rustup component add --toolchain $TOOLCHAIN clippy
<< : *BUILD
before_cache_script: rm -rf $CARGO_HOME/registry/index

# Test that we can build with the lowest version of all dependencies.
# "cargo test" doesn't work because some of our dev-dependencies, like
# rand, can't build with their own minimal dependencies.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ targets = [
]

[dependencies]
libc = { version = "0.2.121", features = [ "extra_traits" ] }
libc = { version = "0.2.124", features = [ "extra_traits" ] }
bitflags = "1.1"
cfg-if = "1.0"

Expand Down