From bd201af5073e714651fb527a0f9b6a363018e3b2 Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Tue, 10 Mar 2026 23:52:44 -0400 Subject: [PATCH] ci: use most recent *bsd versions for CI testing (#1996) --- .github/actions/test-bsd-target/action.yml | 14 +++++++------- .github/workflows/bsd_vm_check.yml | 8 ++++---- .github/workflows/ci.yml | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/actions/test-bsd-target/action.yml b/.github/actions/test-bsd-target/action.yml index f0a53d8e..2b91c489 100644 --- a/.github/actions/test-bsd-target/action.yml +++ b/.github/actions/test-bsd-target/action.yml @@ -5,7 +5,7 @@ inputs: target: description: "Rust target triple (e.g., x86_64-unknown-freebsd)" required: true - os-release: + os-version: description: "OS release version (e.g., 13.2 for FreeBSD)" required: false @@ -16,7 +16,7 @@ runs: uses: vmactions/freebsd-vm@c9f815bc7aa0d34c9fdd0619b034a32d6ca7b57e # v1.4.2 if: ${{ inputs.target == 'x86_64-unknown-freebsd' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/bsd_tests.sh ${{ inputs.target }} @@ -27,7 +27,7 @@ runs: uses: vmactions/freebsd-vm@c9f815bc7aa0d34c9fdd0619b034a32d6ca7b57e # v1.4.2 if: ${{ inputs.target == 'x86_64-unknown-freebsd' && steps.freebsd_attempt_1.outcome == 'failure' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/bsd_tests.sh ${{ inputs.target }} @@ -38,7 +38,7 @@ runs: uses: vmactions/freebsd-vm@c9f815bc7aa0d34c9fdd0619b034a32d6ca7b57e # v1.4.2 if: ${{ inputs.target == 'x86_64-unknown-freebsd' && steps.freebsd_attempt_2.outcome == 'failure' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/bsd_tests.sh ${{ inputs.target }} @@ -48,7 +48,7 @@ runs: uses: vmactions/netbsd-vm@e04aec09540429f9cebb0e7941f7cd0c0fc3b44f # v1.3.6 if: ${{ inputs.target == 'x86_64-unknown-netbsd' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/bsd_tests.sh ${{ inputs.target }} @@ -59,7 +59,7 @@ runs: uses: vmactions/netbsd-vm@e04aec09540429f9cebb0e7941f7cd0c0fc3b44f # v1.3.6 if: ${{ inputs.target == 'x86_64-unknown-netbsd' && steps.netbsd_attempt_1.outcome == 'failure' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/bsd_tests.sh ${{ inputs.target }} @@ -70,7 +70,7 @@ runs: uses: vmactions/netbsd-vm@e04aec09540429f9cebb0e7941f7cd0c0fc3b44f # v1.3.6 if: ${{ inputs.target == 'x86_64-unknown-netbsd' && steps.netbsd_attempt_2.outcome == 'failure' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/bsd_tests.sh ${{ inputs.target }} diff --git a/.github/workflows/bsd_vm_check.yml b/.github/workflows/bsd_vm_check.yml index 7ea6b602..7a6aa6c1 100644 --- a/.github/workflows/bsd_vm_check.yml +++ b/.github/workflows/bsd_vm_check.yml @@ -9,7 +9,7 @@ on: type: string description: "BSD target (x86_64-unknown-freebsd, x86_64-unknown-netbsd, or x86_64-unknown-openbsd)" required: true - os-release: + os-version: type: string description: "Release version" required: true @@ -35,7 +35,7 @@ jobs: uses: vmactions/openbsd-vm@9a8e4351a4a0dc6238e7c69276dcbf6c03bea576 # v1.3.6 if: ${{ inputs.os-target == 'x86_64-unknown-openbsd' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/ci_bsd.sh ${{ inputs.os-target }} @@ -46,7 +46,7 @@ jobs: uses: vmactions/openbsd-vm@9a8e4351a4a0dc6238e7c69276dcbf6c03bea576 # v1.3.6 if: ${{ inputs.os-target == 'x86_64-unknown-openbsd' && steps.openbsd_attempt_1.outcome == 'failure' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/ci_bsd.sh ${{ inputs.os-target }} @@ -57,7 +57,7 @@ jobs: uses: vmactions/openbsd-vm@9a8e4351a4a0dc6238e7c69276dcbf6c03bea576 # v1.3.6 if: ${{ inputs.os-target == 'x86_64-unknown-openbsd' && steps.openbsd_attempt_2.outcome == 'failure' }} with: - release: "${{ inputs.os-release }}" + release: "${{ inputs.os-version }}" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true run: sh ./scripts/ci/ci_bsd.sh ${{ inputs.os-target }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e666fe7..3cd2149d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -260,7 +260,7 @@ jobs: os: "ubuntu-24.04", target: "x86_64-unknown-freebsd", cross: true, - os-release: "13.2", + os-version: "15.0", checks: ["format", "clippy", "test"], } @@ -269,7 +269,7 @@ jobs: os: "ubuntu-24.04", target: "x86_64-unknown-netbsd", cross: true, - os-release: "9.3", + os-version: "10.1", checks: ["clippy", "test"], } runs-on: ${{ matrix.info.os }} @@ -321,7 +321,7 @@ jobs: uses: ./.github/actions/test-bsd-target with: target: ${{ matrix.info.target }} - os-release: ${{ matrix.info.os-release }} + os-version: ${{ matrix.info.os-version }} - name: Set up clippy configuration shell: bash @@ -379,7 +379,7 @@ jobs: # uses: ./.github/workflows/bsd_vm_check.yml # with: # os-target: ${{ matrix.info.target }} - # os-release: ${{ matrix.info.os_release }} + # os-version: ${{ matrix.info.os_release }} completion: name: "CI Pass Check"