diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index 4c09801e7bedc..0000000000000 --- a/.cirrus.yml +++ /dev/null @@ -1,32 +0,0 @@ -task: - only_if: $CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'libc-0.2' || $CIRRUS_BASE_BRANCH == 'main' - env: - HOME: /tmp # cargo cache needs it - TARGET: x86_64-unknown-freebsd - matrix: - # FIXME(#4740): FreeBSD 13 tests are extremely flaky and fail most of the time - # - name: nightly freebsd-13 x86_64 - # freebsd_instance: - # image_family: freebsd-13-4 - - name: nightly freebsd-15 i686 - # Test i686 FreeBSD in 32-bit emulation on a 64-bit host. - env: - TARGET: i686-unknown-freebsd - freebsd_instance: - image: freebsd-15-0-release-amd64-ufs - - name: nightly freebsd-14 x86_64 - freebsd_instance: - image: freebsd-14-4-release-amd64-ufs - - name: nightly freebsd-15 x86_64 - freebsd_instance: - image: freebsd-15-0-release-amd64-ufs - setup_script: - - pkg install -y libnghttp2 curl - - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh -y --default-toolchain nightly --profile=minimal - - . $HOME/.cargo/env - - if [ "$TARGET" = "i686-unknown-freebsd" ]; then rustup target add i686-unknown-freebsd; fi - test_script: - - . $HOME/.cargo/env - - LIBC_CI=1 sh ci/run.sh $TARGET - - sh ci/run.sh $TARGET diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2735055072a64..464cb9511f028 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -274,11 +274,40 @@ jobs: fail-fast: true matrix: include: + # FIXME(#4740): FreeBSD 13 tests are extremely flaky and fail most of the time + # - release: "13.4" + # target: x86_64-unknown-freebsd + - release: "15.0" + target: i686-unknown-freebsd + - release: "14.4" + target: x86_64-unknown-freebsd + - release: "15.0" + target: x86_64-unknown-freebsd - target: x86_64-pc-solaris - target: x86_64-unknown-netbsd timeout-minutes: 25 steps: - uses: actions/checkout@v6 + - name: Test on FreeBSD + uses: vmactions/freebsd-vm@v1.4.5 + if: contains(matrix.target, 'freebsd') + with: + release: ${{ matrix.release }} + usesh: true + copyback: false + prepare: | + set -ex + pkg install -y libnghttp2 curl + curl https://sh.rustup.rs -sSf --output rustup.sh + sh rustup.sh -y --default-toolchain nightly --profile=minimal + . "$HOME/.cargo/env" + rustup target add ${{ matrix.target }} + run: | + set -ex + . "$HOME/.cargo/env" + LIBC_CI=1 ./ci/run.sh ${{ matrix.target }} + ./ci/run.sh ${{ matrix.target }} + - name: test on Solaris uses: vmactions/solaris-vm@v1.3.2 if: contains(matrix.target, 'solaris') @@ -288,7 +317,7 @@ jobs: mem: 4096 copyback: false prepare: | - set -x + set -ex source <(curl -s https://raw.githubusercontent.com/psumbera/solaris-rust/refs/heads/main/sh.rust-web-install) rustc --version uname -a @@ -305,12 +334,12 @@ jobs: mem: 4096 copyback: false prepare: | - set -x + set -ex /usr/sbin/pkg_add curl curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ --profile minimal --default-toolchain nightly -y run: | - set -x + set -ex . "$HOME/.cargo/env" which rustc rustc -Vv diff --git a/Cargo.toml b/Cargo.toml index ffe53535f9c36..0986492aae876 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "libc" version = "1.0.0-alpha.3" keywords = ["libc", "ffi", "bindings", "operating", "system"] categories = ["external-ffi-bindings", "no-std", "os"] -exclude = ["/ci/*", "/.github/*", "/.cirrus.yml", "/triagebot.toml"] +exclude = ["/ci/*", "/.github/*", "/triagebot.toml"] description = "Raw FFI bindings to platform libraries like libc." authors = ["The Rust Project Developers"] edition = "2021" diff --git a/README.md b/README.md index 873360c8dec82..f8b2d58313402 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # libc - Raw FFI bindings to platforms' system libraries -[![GHA Status]][GitHub Actions] [![Cirrus CI Status]][Cirrus CI] [![Latest Version]][crates.io] [![Documentation]][docs.rs] ![License] +[![GHA Status]][GitHub Actions] [![Latest Version]][crates.io] [![Documentation]][docs.rs] ![License] `libc` provides all of the definitions necessary to easily interoperate with C code (or "C-like" code) on each of the platforms that Rust supports. This @@ -67,8 +67,8 @@ you want to see. See [`ci/verify-build.py`](https://github.com/rust-lang/libc/blob/HEAD/ci/verify-build.py) for the platforms on which `libc` is guaranteed to build for each Rust toolchain. -The test-matrix at [GitHub Actions] and [Cirrus CI] show the platforms in which -`libc` tests are run. +The test matrices at [GitHub Actions] show the platforms in which `libc` tests +are run.
@@ -102,8 +102,6 @@ dual licensed as above, without any additional terms or conditions. [GitHub Actions]: https://github.com/rust-lang/libc/actions [GHA Status]: https://github.com/rust-lang/libc/workflows/CI/badge.svg -[Cirrus CI]: https://cirrus-ci.com/github/rust-lang/libc -[Cirrus CI Status]: https://api.cirrus-ci.com/github/rust-lang/libc.svg [crates.io]: https://crates.io/crates/libc [Latest Version]: https://img.shields.io/crates/v/libc.svg [Documentation]: https://docs.rs/libc/badge.svg diff --git a/ci/README.md b/ci/README.md index d97b98acfcd08..4e5b552d58892 100644 --- a/ci/README.md +++ b/ci/README.md @@ -20,9 +20,8 @@ First up, let's talk about the files in this directory: # CI Systems -Currently this repository leverages a combination of GitHub Actions and Cirrus -CI for running tests. You can find tested triples in [Actions config] or -[Cirrus config]. +Currently this repository uses GitHub Actions workflows for running tests. You +can find tested triples in [Actions config]. The Windows triples are all pretty standard, they just set up their environment then run tests, no need for downloading any extra target libs (we just download @@ -44,7 +43,6 @@ The remaining architectures look like: and compile/run tests. More information on that below. [Actions config]: https://github.com/rust-lang/libc/tree/HEAD/.github/workflows -[Cirrus config]: https://github.com/rust-lang/libc/blob/HEAD/.cirrus.yml [android-docker]: https://github.com/rust-lang/libc/blob/HEAD/ci/docker/x86_64-linux-android/Dockerfile ## QEMU diff --git a/triagebot.toml b/triagebot.toml index c192178a9baa4..91bc102738b54 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -22,7 +22,6 @@ check-commits = "uncanonicalized" [autolabel."A-CI"] trigger_files = [ - ".cirrus.yml", ".github", "ci", ]