From 1e81af1c74ab0047dac94dc964fce347b45fd9fe Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 13 Jul 2026 17:44:38 +0200 Subject: [PATCH 1/3] CI: upgrade to FreeBSD 15.1 --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a0e784067..176859dd65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -396,11 +396,11 @@ jobs: matrix: include: - os: freebsd - version: '14.3' + version: '15.1' display_name: FreeBSD # Controls binary build and provenance attestation on tags do_binaries: true - artifact_prefix: borg-freebsd-14-x86_64-gh + artifact_prefix: borg-freebsd-15-x86_64-gh - os: netbsd version: '10.1' @@ -448,11 +448,11 @@ jobs: sudo -E pkg install -y rust sudo -E pkg install -y gmake sudo -E pkg install -y git - sudo -E pkg install -y python311 py311-sqlite3 py311-pip py311-virtualenv - sudo ln -sf /usr/local/bin/python3.11 /usr/local/bin/python3 - sudo ln -sf /usr/local/bin/python3.11 /usr/local/bin/python - sudo ln -sf /usr/local/bin/pip3.11 /usr/local/bin/pip3 - sudo ln -sf /usr/local/bin/pip3.11 /usr/local/bin/pip + sudo -E pkg install -y python314 py314-sqlite3 py314-pip py314-virtualenv + sudo ln -sf /usr/local/bin/python3.14 /usr/local/bin/python3 + sudo ln -sf /usr/local/bin/python3.14 /usr/local/bin/python + sudo ln -sf /usr/local/bin/pip3.14 /usr/local/bin/pip3 + sudo ln -sf /usr/local/bin/pip3.14 /usr/local/bin/pip # required for libsodium/pynacl build export MAKE=gmake @@ -464,7 +464,7 @@ jobs: python -m pip install --upgrade pip wheel pip install -r requirements.d/development.lock.txt pip install -e ".[mfusepy,cockpit,s3,sftp,rclone]" - tox -e py311-mfusepy + tox -e py314-mfusepy if [[ "${{ matrix.do_binaries }}" == "true" && "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then python -m pip install -r requirements.d/pyinstaller.txt From 70df953b48519589cf1409e97b39af1c79825d0a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 13 Jul 2026 17:50:05 +0200 Subject: [PATCH 2/3] no pip no virtualenv --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 176859dd65..de347402cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -448,7 +448,7 @@ jobs: sudo -E pkg install -y rust sudo -E pkg install -y gmake sudo -E pkg install -y git - sudo -E pkg install -y python314 py314-sqlite3 py314-pip py314-virtualenv + sudo -E pkg install -y python314 py314-sqlite3 sudo ln -sf /usr/local/bin/python3.14 /usr/local/bin/python3 sudo ln -sf /usr/local/bin/python3.14 /usr/local/bin/python sudo ln -sf /usr/local/bin/pip3.14 /usr/local/bin/pip3 From 73b03ad9ea460cfc136c5554553bfa65d570b4d0 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 13 Jul 2026 19:54:43 +0200 Subject: [PATCH 3/3] first build binary, then run tests --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de347402cf..722aa5b082 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -464,8 +464,6 @@ jobs: python -m pip install --upgrade pip wheel pip install -r requirements.d/development.lock.txt pip install -e ".[mfusepy,cockpit,s3,sftp,rclone]" - tox -e py314-mfusepy - if [[ "${{ matrix.do_binaries }}" == "true" && "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then python -m pip install -r requirements.d/pyinstaller.txt ./scripts/build-borg-using-pyinstaller.sh @@ -486,6 +484,8 @@ jobs: cp -v dist/binary/borg.tgz artifacts/${{ matrix.artifact_prefix }}.tgz fi fi + export PATH="$(pwd)/dist/binary:$PATH" + tox -e py314-mfusepy ;; netbsd)