Skip to content

[0.2] Backports #4315

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

Merged
merged 10 commits into from
Mar 10, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Rust toolchain
run: ./ci/install-rust.sh
run: ./ci/install-rust.sh && rustup component add rustfmt
- name: Check style
run: ./ci/style.sh

Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const CHECK_CFG_EXTRA: &'static [(&'static str, &'static [&'static str])] = &[
(
"target_os",
&[
"switch", "aix", "ohos", "hurd", "rtems", "visionos", "nuttx",
"switch", "aix", "ohos", "hurd", "rtems", "visionos", "nuttx", "cygwin",
],
),
("target_env", &["illumos", "wasi", "aix", "ohos"]),
Expand Down
2 changes: 1 addition & 1 deletion ci/install-rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [ "$os" = "windows" ] && [ -n "${TARGET:-}" ]; then
fi

rustup set profile minimal
rustup update --force "$toolchain"
rustup update --force "$toolchain" --no-self-update
rustup default "$toolchain"

if [ -n "${TARGET:-}" ]; then
Expand Down
7 changes: 1 addition & 6 deletions ci/style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@

set -eux

if [ -n "${CI:-}" ]; then
rustup toolchain install nightly -c rustfmt --allow-downgrade
rustup override set nightly

check="--check"
fi
[ -n "${CI:-}" ] && check="--check"

cargo test --manifest-path libc-test/Cargo.toml --test style -- --nocapture

Expand Down
Loading
Loading