Skip to content

Replace Cirrus CI with more Github Workflows jobs#2776

Merged
SteveLauC merged 5 commits into
nix-rust:masterfrom
asomers:vmactions2
May 11, 2026
Merged

Replace Cirrus CI with more Github Workflows jobs#2776
SteveLauC merged 5 commits into
nix-rust:masterfrom
asomers:vmactions2

Conversation

@asomers
Copy link
Copy Markdown
Member

@asomers asomers commented Apr 15, 2026

Because Cirrus Labs is shutting down soon. This PR adds a FreeBSD x86_64 job that uses vmactions/freebsd-vm. It also adds jobs for FreeBSD/aarch64, NetBSD, Haiku, OpenBSD, and OmniOS, but they're all currently disabled. With a little bit more work, we could combine the existing Solaris job with this one.

Fixes #2768

What does this PR do

Checklist:

  • I have read CONTRIBUTING.md
  • I have written necessary tests and rustdoc comments
  • A change log has been added if this PR modifies nix's API

@xtqqczze
Copy link
Copy Markdown
Contributor

xtqqczze commented Apr 15, 2026

Maybe add FreeBSD 15.0 to the job matrix alongside 14.4. FreeBSD 13.5 is also still supported, but I recall it having issues in CI.

@asomers
Copy link
Copy Markdown
Member Author

asomers commented Apr 15, 2026

Maybe add FreeBSD 15.0 to the job matrix alongside 14.4. FreeBSD 13.5 is also still supported, but I recall it having issues in CI.

We easily could. But I don't think it would give us a useful amount of additional coverage. Nix doesn't currently have any FreeBSD-15-specific functionality. IMHO, testing on FreeBSD 15 isn't worth the CPU cycles.

Because Cirrus Labs is shutting down soon.  This PR adds a FreeBSD
x86_64 job that uses vmactions/freebsd-vm.  It also adds jobs for
FreeBSD/aarch64, NetBSD, Haiku, OpenBSD, and OmniOS, but they're all
currently disabled.  With a little bit more work, we could combine the
existing Solaris job with this one.

Fixes nix-rust#2768
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR migrates CI away from Cirrus CI (scheduled to shut down) by removing Cirrus configuration and adding GitHub Actions workflow coverage for additional OSes via vmactions VMs (with only FreeBSD x86_64 currently enabled).

Changes:

  • Remove Cirrus CI configuration, documentation references, and the Cirrus-specific test skip macro.
  • Add a new GitHub Actions vmactions job to run build/test/clippy/doc in a FreeBSD 14.4 x86_64 VM (with additional OS/arch entries present but commented out).
  • Clean up docs/README to no longer reference Cirrus CI.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
test/sys/test_socket.rs Removes a Cirrus-only skip for an AF_ALG test.
test/common/mod.rs Deletes the skip_if_cirrus! macro implementation.
README.md Removes the Cirrus CI status badge.
CONTRIBUTING.md Updates CI guidance to remove Cirrus references and CI skip instructions tied to Cirrus.
.github/workflows/ci.yml Adds a vmactions VM-based job (FreeBSD enabled; other OSes disabled via comments).
.cirrus.yml Deletes the Cirrus CI configuration file.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .github/workflows/ci.yml
Comment thread .github/workflows/ci.yml Outdated
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Comment thread .github/workflows/ci.yml
Comment thread .github/workflows/ci.yml Outdated
Comment thread .github/workflows/ci.yml Outdated
Comment thread CONTRIBUTING.md Outdated
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Comment thread .github/workflows/ci.yml
Comment thread CONTRIBUTING.md Outdated
Comment thread .github/workflows/ci.yml Outdated
Comment thread .github/workflows/ci.yml Outdated
Copy link
Copy Markdown
Member

@SteveLauC SteveLauC left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge this!

@SteveLauC SteveLauC added this pull request to the merge queue May 11, 2026
Merged via the queue into nix-rust:master with commit 5d6a46e May 11, 2026
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CirrusCI will shut down on 2026-06-01

4 participants