Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
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
Expand All @@ -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 py311-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
Expand All @@ -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)
Expand Down
Loading