Skip to content

Commit f697deb

Browse files
committed
chore: migrate from Cirrus CI to GHA
(cherry picked from commit 088a284)
1 parent 71d5bfc commit f697deb

6 files changed

Lines changed: 38 additions & 46 deletions

File tree

.cirrus.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/ci.yaml

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,40 @@ jobs:
265265
fail-fast: true
266266
matrix:
267267
include:
268+
# FIXME(#4740): FreeBSD 13 tests are extremely flaky and fail most of the time
269+
# - release: "13.4"
270+
# target: x86_64-unknown-freebsd
271+
- release: "15.0"
272+
target: i686-unknown-freebsd
273+
- release: "14.4"
274+
target: x86_64-unknown-freebsd
275+
- release: "15.0"
276+
target: x86_64-unknown-freebsd
268277
- target: x86_64-pc-solaris
269278
- target: x86_64-unknown-netbsd
270279
timeout-minutes: 25
271280
steps:
272281
- uses: actions/checkout@v6
282+
- name: Test on FreeBSD
283+
uses: vmactions/freebsd-vm@v1.4.5
284+
if: contains(matrix.target, 'freebsd')
285+
with:
286+
release: ${{ matrix.release }}
287+
usesh: true
288+
copyback: false
289+
prepare: |
290+
set -ex
291+
pkg install -y libnghttp2 curl
292+
curl https://sh.rustup.rs -sSf --output rustup.sh
293+
sh rustup.sh -y --default-toolchain nightly --profile=minimal
294+
. "$HOME/.cargo/env"
295+
rustup target add ${{ matrix.target }}
296+
run: |
297+
set -ex
298+
. "$HOME/.cargo/env"
299+
LIBC_CI=1 ./ci/run.sh ${{ matrix.target }}
300+
./ci/run.sh ${{ matrix.target }}
301+
273302
- name: test on Solaris
274303
uses: vmactions/solaris-vm@v1.3.2
275304
if: contains(matrix.target, 'solaris')
@@ -279,7 +308,7 @@ jobs:
279308
mem: 4096
280309
copyback: false
281310
prepare: |
282-
set -x
311+
set -ex
283312
source <(curl -s https://raw.githubusercontent.com/psumbera/solaris-rust/refs/heads/main/sh.rust-web-install)
284313
rustc --version
285314
uname -a
@@ -296,12 +325,12 @@ jobs:
296325
mem: 4096
297326
copyback: false
298327
prepare: |
299-
set -x
328+
set -ex
300329
/usr/sbin/pkg_add curl
301330
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
302331
--profile minimal --default-toolchain nightly -y
303332
run: |
304-
set -x
333+
set -ex
305334
. "$HOME/.cargo/env"
306335
which rustc
307336
rustc -Vv

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libc"
33
version = "0.2.185"
44
keywords = ["libc", "ffi", "bindings", "operating", "system"]
55
categories = ["external-ffi-bindings", "no-std", "os"]
6-
exclude = ["/ci/*", "/.github/*", "/.cirrus.yml", "/triagebot.toml", "cherry-pick-stable.sh"]
6+
exclude = ["/ci/*", "/.github/*", "/triagebot.toml", "cherry-pick-stable.sh"]
77
description = "Raw FFI bindings to platform libraries like libc."
88
authors = ["The Rust Project Developers"]
99
edition = "2021"

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# libc - Raw FFI bindings to platforms' system libraries
22

3-
[![GHA Status]][GitHub Actions] [![Cirrus CI Status]][Cirrus CI] [![Latest Version]][crates.io] [![Documentation]][docs.rs] ![License]
3+
[![GHA Status]][GitHub Actions] [![Latest Version]][crates.io] [![Documentation]][docs.rs] ![License]
44

55
`libc` provides all of the definitions necessary to easily interoperate with C
66
code (or "C-like" code) on each of the platforms that Rust supports. This
@@ -73,8 +73,8 @@ you want to see.
7373

7474
See [`ci/verify-build.py`](https://github.com/rust-lang/libc/blob/HEAD/ci/verify-build.py) for
7575
the platforms on which `libc` is guaranteed to build for each Rust toolchain.
76-
The test-matrix at [GitHub Actions] and [Cirrus CI] show the platforms in which
77-
`libc` tests are run.
76+
The test matrices at [GitHub Actions] show the platforms in which `libc` tests
77+
are run.
7878

7979
<div class="platform_docs"></div>
8080

@@ -108,8 +108,6 @@ dual licensed as above, without any additional terms or conditions.
108108

109109
[GitHub Actions]: https://github.com/rust-lang/libc/actions
110110
[GHA Status]: https://github.com/rust-lang/libc/workflows/CI/badge.svg
111-
[Cirrus CI]: https://cirrus-ci.com/github/rust-lang/libc
112-
[Cirrus CI Status]: https://api.cirrus-ci.com/github/rust-lang/libc.svg
113111
[crates.io]: https://crates.io/crates/libc
114112
[Latest Version]: https://img.shields.io/crates/v/libc.svg
115113
[Documentation]: https://docs.rs/libc/badge.svg

ci/README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ First up, let's talk about the files in this directory:
2020

2121
# CI Systems
2222

23-
Currently this repository leverages a combination of GitHub Actions and Cirrus
24-
CI for running tests. You can find tested triples in [Actions config] or
25-
[Cirrus config].
23+
Currently this repository uses GitHub Actions workflows for running tests. You
24+
can find tested triples in [Actions config].
2625

2726
The Windows triples are all pretty standard, they just set up their environment
2827
then run tests, no need for downloading any extra target libs (we just download
@@ -44,7 +43,6 @@ The remaining architectures look like:
4443
and compile/run tests. More information on that below.
4544

4645
[Actions config]: https://github.com/rust-lang/libc/tree/HEAD/.github/workflows
47-
[Cirrus config]: https://github.com/rust-lang/libc/blob/HEAD/.cirrus.yml
4846
[android-docker]: https://github.com/rust-lang/libc/blob/HEAD/ci/docker/x86_64-linux-android/Dockerfile
4947

5048
## QEMU

triagebot.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ check-commits = "uncanonicalized"
2222

2323
[autolabel."A-CI"]
2424
trigger_files = [
25-
".cirrus.yml",
2625
".github",
2726
"ci",
2827
]

0 commit comments

Comments
 (0)