From 69fedebc02d48636748449a2add3a1c0742429b0 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Thu, 16 Apr 2026 13:28:33 -0600
Subject: [PATCH 1/2] Move FreeBSD's CI from Cirrus to Github Workflows

Because Cirrus Labs will soon shut down.

Fixes #1610
---
 .cirrus.yml                | 47 --------------------------------------
 .github/workflows/main.yml | 28 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 47 deletions(-)
 delete mode 100644 .cirrus.yml

diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index bfeeefc9b..000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Implementation derived from `.cirrus.yml` in Rust's libc bindings
-# at revision 7f4774e76bd5cb9ccb7140d71ef9be9c16009cdf.
-
-task:
-  name: stable x86_64-unknown-freebsd-14
-  freebsd_instance:
-    image_family: freebsd-14-3
-  setup_script:
-    - curl https://sh.rustup.rs -sSf --output rustup.sh
-    - sh rustup.sh --default-toolchain stable -y --profile=minimal
-    - . $HOME/.cargo/env
-    - rustup default stable
-  test_script:
-    - . $HOME/.cargo/env
-    - cargo test --workspace --features=all-apis
-
-task:
-  name: stable x86_64-unknown-freebsd-15
-  freebsd_instance:
-    image_family: freebsd-15-0-amd64-ufs
-  setup_script:
-    - curl https://sh.rustup.rs -sSf --output rustup.sh
-    - sh rustup.sh --default-toolchain stable -y --profile=minimal
-    - . $HOME/.cargo/env
-    - rustup default stable
-  test_script:
-    - . $HOME/.cargo/env
-    - cargo test --workspace --features=all-apis
-
-
-# Temporarily disabled due to this error:
-#
-# ```
-# Failed to start an instance: INVALID_ARGUMENT: Snap images are not supported due to boot stability.
-# ```
-#task:
-#  name: stable x86_64-unknown-freebsd-16
-#  freebsd_instance:
-#    image_family: freebsd-16-0-snap
-#  setup_script:
-#    - curl https://sh.rustup.rs -sSf --output rustup.sh
-#    - sh rustup.sh --default-toolchain stable -y --profile=minimal
-#    - . $HOME/.cargo/env
-#    - rustup default stable
-#  test_script:
-#    - . $HOME/.cargo/env
-#    - cargo test --workspace --features=all-apis
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0955f7683..9b76e2019 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -773,6 +773,34 @@ jobs:
       env:
         RUST_BACKTRACE: full
 
+  test_vmactions:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - freebsd_version: "14.3"
+          - freebsd_version: "15.0"
+    name: FreeBSD ${{ matrix.freebsd_version }}
+    steps:
+      - uses: actions/checkout@v6
+      - name: Start VM
+        uses: vmactions/freebsd-vm@v1
+        with:
+          release: ${{ matrix.freebsd_version }}
+          usesh: true
+      - name: Install dependencies
+        shell: freebsd {0}
+        run: |
+          pkg install -y curl
+          fetch https://sh.rustup.rs -o rustup.sh
+          sh rustup.sh -y --profile=minimal
+      - name: Test
+        shell: freebsd {0}
+        run: |
+          . $HOME/.cargo/env
+          cargo test --verbose --features=all-apis --workspace -- --nocapture 
+
   test_rustix_use_experimental_asm:
     name: Test rustix_use_experimental_asm
     runs-on: ${{ matrix.os }}

From 9d1419f85015befc3e7742e83e2a1b23152aa7bb Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Thu, 16 Apr 2026 20:09:09 -0700
Subject: [PATCH 2/2] Apply suggestion from @xtqqczze

Co-authored-by: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9b76e2019..fc1498238 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -779,7 +779,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - freebsd_version: "14.3"
+          - freebsd_version: "14.4"
           - freebsd_version: "15.0"
     name: FreeBSD ${{ matrix.freebsd_version }}
     steps: