From 4023340c2b124b8960523181788e105d5b6a0ffe Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Sat, 18 Jul 2026 03:40:23 -0400 Subject: [PATCH] ci: bump CI netbsd-vm to v1.4.2 (#2157) Bumps the netbsd-vm action to the SHA equivalent of 1.4.2. Would like to get rid of this but cross doesn't work for tests for BSDs :/ Hopefully I can figure it out at some point. --- .github/actions/test-bsd-target/action.yml | 42 ++++++++++++++-------- .github/workflows/ci.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/test_docs.yml | 2 +- .github/workflows/validate_schema.yml | 2 +- 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.github/actions/test-bsd-target/action.yml b/.github/actions/test-bsd-target/action.yml index 137c9fa3..265c188b 100644 --- a/.github/actions/test-bsd-target/action.yml +++ b/.github/actions/test-bsd-target/action.yml @@ -1,5 +1,7 @@ name: Test BSD Target -description: Run tests for a BSD target using VMs, with retries on failure. Needed as cross doesn't support them (https://github.com/cross-rs/cross/wiki/FAQ#running-bsd-tests). +description: Run tests for a BSD target using VMs, with retries on failure. + Needed as cross doesn't support them + (https://github.com/cross-rs/cross/wiki/FAQ#running-bsd-tests). inputs: target: @@ -17,7 +19,8 @@ runs: if: ${{ inputs.target == 'x86_64-unknown-freebsd' }} with: release: "${{ inputs.os-version }}" - envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" + envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG + CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true prepare: | # See https://github.com/freebsd/pkg/issues/2653#issuecomment-4321269771 @@ -28,10 +31,12 @@ runs: - name: FreeBSD Test (Attempt 2) uses: vmactions/freebsd-vm@c9f815bc7aa0d34c9fdd0619b034a32d6ca7b57e # v1.4.2 - if: ${{ inputs.target == 'x86_64-unknown-freebsd' && steps.freebsd_attempt_1.outcome == 'failure' }} + if: ${{ inputs.target == 'x86_64-unknown-freebsd' && + steps.freebsd_attempt_1.outcome == 'failure' }} with: release: "${{ inputs.os-version }}" - envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" + envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG + CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true prepare: | # See https://github.com/freebsd/pkg/issues/2653#issuecomment-4321269771 @@ -42,45 +47,52 @@ runs: - name: FreeBSD Test (Attempt 3) uses: vmactions/freebsd-vm@c9f815bc7aa0d34c9fdd0619b034a32d6ca7b57e # v1.4.2 - if: ${{ inputs.target == 'x86_64-unknown-freebsd' && steps.freebsd_attempt_2.outcome == 'failure' }} + if: ${{ inputs.target == 'x86_64-unknown-freebsd' && + steps.freebsd_attempt_2.outcome == 'failure' }} with: release: "${{ inputs.os-version }}" - envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" + envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG + CARGO_HUSKY_DONT_INSTALL_HOOKS" usesh: true prepare: | # See https://github.com/freebsd/pkg/issues/2653#issuecomment-4321269771 pkg upgrade -Fqy || true run: sh ./scripts/ci/bsd_tests.sh ${{ inputs.target }} - id: freebsd_attempt_3 + id: freebsd_attempt_3F - name: NetBSD Test (Attempt 1) - uses: vmactions/netbsd-vm@e04aec09540429f9cebb0e7941f7cd0c0fc3b44f # v1.3.6 + uses: vmactions/netbsd-vm@0c26a4c4a5e234038862a4a53a00c905b8a107c9 # v1.4.2 if: ${{ inputs.target == 'x86_64-unknown-netbsd' }} with: release: "${{ inputs.os-version }}" - envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" + 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 }} id: netbsd_attempt_1 continue-on-error: true - name: NetBSD Test (Attempt 2) - uses: vmactions/netbsd-vm@e04aec09540429f9cebb0e7941f7cd0c0fc3b44f # v1.3.6 - if: ${{ inputs.target == 'x86_64-unknown-netbsd' && steps.netbsd_attempt_1.outcome == 'failure' }} + uses: vmactions/netbsd-vm@0c26a4c4a5e234038862a4a53a00c905b8a107c9 # v1.4.2 + if: ${{ inputs.target == 'x86_64-unknown-netbsd' && + steps.netbsd_attempt_1.outcome == 'failure' }} with: release: "${{ inputs.os-version }}" - envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" + 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 }} id: netbsd_attempt_2 continue-on-error: true - name: NetBSD Test (Attempt 3) - uses: vmactions/netbsd-vm@e04aec09540429f9cebb0e7941f7cd0c0fc3b44f # v1.3.6 - if: ${{ inputs.target == 'x86_64-unknown-netbsd' && steps.netbsd_attempt_2.outcome == 'failure' }} + uses: vmactions/netbsd-vm@0c26a4c4a5e234038862a4a53a00c905b8a107c9 # v1.4.2 + if: ${{ inputs.target == 'x86_64-unknown-netbsd' && + steps.netbsd_attempt_2.outcome == 'failure' }} with: release: "${{ inputs.os-version }}" - envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" + 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 }} id: netbsd_attempt_3 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb4fc719..394eb92c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: uses: ClementTsang/skip-duplicate-actions@41b0a75f656d455934ffa6a46b779d8d996ac47c with: skip_after_successful_duplicate: "true" - paths: '[".cargo/**", ".github/workflows/ci.yml", ".github/ci/**", "sample_configs/**", "src/**", "tests/**", "build.rs", "Cargo.lock", "Cargo.toml", "clippy.toml", "rustfmt.toml", "Cross.toml"]' + paths: '[".cargo/**", ".github/actions/**", ".github/ci/**", ".github/workflows/ci.yml", "sample_configs/**", "src/**", "tests/**", "build.rs", "Cargo.lock", "Cargo.toml", "clippy.toml", "rustfmt.toml", "Cross.toml"]' do_not_skip: '["workflow_dispatch", "push"]' # Runs rustfmt + tests + clippy on the main supported platforms. diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 123b956d..4da16b49 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: uses: ClementTsang/skip-duplicate-actions@41b0a75f656d455934ffa6a46b779d8d996ac47c with: skip_after_successful_duplicate: "false" - paths: '["tests/**", "src/**", ".github/workflows/coverage.yml", ".github/ci", ".cargo/**", "Cargo.toml", "Cargo.lock", "build.rs"]' + paths: '["tests/**", "src/**", ".github/actions/**", ".github/ci/**", ".github/workflows/coverage.yml", ".cargo/**", "Cargo.toml", "Cargo.lock", "build.rs"]' do_not_skip: '["workflow_dispatch", "push"]' coverage: diff --git a/.github/workflows/test_docs.yml b/.github/workflows/test_docs.yml index afd95756..c69f5b25 100644 --- a/.github/workflows/test_docs.yml +++ b/.github/workflows/test_docs.yml @@ -22,7 +22,7 @@ jobs: uses: ClementTsang/skip-duplicate-actions@41b0a75f656d455934ffa6a46b779d8d996ac47c with: skip_after_successful_duplicate: "true" - paths: '["docs/**", ".github/workflows/docs.yml", ".github/workflows/test_docs.yml"]' + paths: '["docs/**", ".github/actions/**", ".github/ci/**", ".github/workflows/docs.yml", ".github/workflows/test_docs.yml"]' do_not_skip: '["workflow_dispatch"]' test-build-documentation: diff --git a/.github/workflows/validate_schema.yml b/.github/workflows/validate_schema.yml index a875ca6c..e33bde4a 100644 --- a/.github/workflows/validate_schema.yml +++ b/.github/workflows/validate_schema.yml @@ -31,7 +31,7 @@ jobs: uses: ClementTsang/skip-duplicate-actions@41b0a75f656d455934ffa6a46b779d8d996ac47c with: skip_after_successful_duplicate: "true" - paths: '["schema/**", "scripts/schema/**", ".github/workflows/validate_schema.yml", ".github/ci", "tools/schema_gen/**", "Cargo.toml"]' + paths: '["schema/**", "scripts/schema/**", ".github/actions/**", ".github/ci/**", ".github/workflows/validate_schema.yml", "tools/schema_gen/**", "Cargo.toml"]' do_not_skip: '["workflow_dispatch"]' test-build-documentation: