From 9c2fc40491f95188899a3bd9bede33f0a4a1f40d Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Sun, 22 Nov 2026 01:16:55 -0500 Subject: [PATCH] ci: update netbsd VM version + cross netbsd CDN (#2333) Hopefully fixes the VM or builds failing constantly. --- .github/actions/test-bsd-target/action.yml | 6 +++--- Cross.toml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/test-bsd-target/action.yml b/.github/actions/test-bsd-target/action.yml index 84e352a3..fc68b2f8 100644 --- a/.github/actions/test-bsd-target/action.yml +++ b/.github/actions/test-bsd-target/action.yml @@ -61,7 +61,7 @@ runs: id: freebsd_attempt_3F - name: NetBSD Test (Attempt 1) - uses: vmactions/netbsd-vm@c8a0d7ddb84619a7a8cc4e652efa7950b3fd9f92 # v1.5.2 + uses: vmactions/netbsd-vm@5957cf330aef2e6ddc63c604364c99ce2e02b91d # v1.5.2 if: ${{ inputs.target == 'x86_64-unknown-netbsd' }} with: release: "${{ inputs.os-version }}" @@ -73,7 +73,7 @@ runs: continue-on-error: true - name: NetBSD Test (Attempt 2) - uses: vmactions/netbsd-vm@c8a0d7ddb84619a7a8cc4e652efa7950b3fd9f92 # v1.5.2 + uses: vmactions/netbsd-vm@5957cf330aef2e6ddc63c604364c99ce2e02b91d # v1.5.2 if: ${{ inputs.target == 'x86_64-unknown-netbsd' && steps.netbsd_attempt_1.outcome == 'failure' }} with: @@ -86,7 +86,7 @@ runs: continue-on-error: true - name: NetBSD Test (Attempt 3) - uses: vmactions/netbsd-vm@c8a0d7ddb84619a7a8cc4e652efa7950b3fd9f92 # v1.5.2 + uses: vmactions/netbsd-vm@5957cf330aef2e6ddc63c604364c99ce2e02b91d # v1.5.2 if: ${{ inputs.target == 'x86_64-unknown-netbsd' && steps.netbsd_attempt_2.outcome == 'failure' }} with: diff --git a/Cross.toml b/Cross.toml index 254868ae..83903c81 100644 --- a/Cross.toml +++ b/Cross.toml @@ -3,6 +3,6 @@ passthrough = ["RUST_BACKTRACE", "BTM_GENERATE"] [target.x86_64-unknown-netbsd] pre-build = [ - # Last updated on 2026-10-27 - "apt-get update && apt-get install -y --no-install-recommends curl=8.5.0-2ubuntu10.16 xz-utils=5.6.1+really5.4.5-1ubuntu0.4 && td=$(mktemp -d) && mkdir -p \"$td/netbsd\" && curl -4 --retry 3 -sSfL 'http://ftp.fr.netbsd.org/pub/NetBSD/NetBSD-9.5/amd64/binary/sets/base.tar.xz' | tar -C \"$td/netbsd\" -xJ ./usr/lib ./lib && curl -4 --retry 3 -sSfL 'http://ftp.fr.netbsd.org/pub/NetBSD/NetBSD-9.5/amd64/binary/sets/comp.tar.xz' | tar -C \"$td/netbsd\" -xJ ./usr/lib && cp \"$td\"/netbsd/usr/lib/libkvm* /usr/local/x86_64-unknown-netbsd/lib/ && rm -rf \"$td\"", + # Last updated on 2026-11-22 + "apt-get update && apt-get install -y --no-install-recommends curl=8.5.0-2ubuntu10.16 xz-utils=5.6.1+really5.4.5-1ubuntu0.4 && td=$(mktemp -d) && mkdir -p \"$td/netbsd\" && curl -4 --retry 3 -sSfL 'https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.5/amd64/binary/sets/base.tar.xz' | tar -C \"$td/netbsd\" -xJ ./usr/lib ./lib && curl -4 --retry 3 -sSfL 'https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.5/amd64/binary/sets/comp.tar.xz' | tar -C \"$td/netbsd\" -xJ ./usr/lib && cp \"$td\"/netbsd/usr/lib/libkvm* /usr/local/x86_64-unknown-netbsd/lib/ && rm -rf \"$td\"", ]