Skip to content

binary build: install cockpit,s3,sftp extras #9276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasWaldmann merged 3 commits into from
Feb 14, 2026
+10 −7
Merged

binary build: install cockpit,s3,sftp extras #9276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce7d3ee
binary build: install cockpit,s3,sftp extras
ThomasWaldmann Jan 28, 2026
92ebb97
CI: add borg.exe to PATH
ThomasWaldmann Jan 28, 2026
94d56e1
pyinstaller: cockpit: add tcss file, add unicode data
ThomasWaldmann Jan 28, 2026
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
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,13 @@ jobs:
- name: Install borgbackup
run: |
if [[ "$TOXENV" == *"llfuse"* ]]; then
pip install -ve ".[llfuse]"
pip install -ve ".[llfuse,cockpit,s3,sftp]"
elif [[ "$TOXENV" == *"pyfuse3"* ]]; then
pip install -ve ".[pyfuse3]"
pip install -ve ".[pyfuse3,cockpit,s3,sftp]"
elif [[ "$TOXENV" == *"mfusepy"* ]]; then
pip install -ve ".[mfusepy]"
pip install -ve ".[mfusepy,cockpit,s3,sftp]"
else
pip install -ve .
pip install -ve ".[cockpit,s3,sftp]"
fi

- name: Build Borg fat binaries (${{ matrix.binary }})
Expand All @@ -305,6 +305,8 @@ jobs:
./borg-dir/borg.exe -V
tar czf borg.tgz borg-dir
popd
# Ensure locally built binary in ./dist/binary/borg-dir is found during tests
export PATH="$GITHUB_WORKSPACE/dist/binary/borg-dir:$PATH"
echo "borg.exe binary in PATH"
borg.exe -V

Expand Down Expand Up @@ -454,7 +456,7 @@ jobs:
pip -V
python -m pip install --upgrade pip wheel
pip install -r requirements.d/development.txt
pip install -e ".[mfusepy]"
pip install -e ".[mfusepy,cockpit,s3,sftp]"
tox -e py311-mfusepy

if [[ "${{ matrix.do_binaries }}" == "true" && "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then
Expand Down Expand Up @@ -638,7 +640,7 @@ jobs:
run: |
# build borg.exe
. env/bin/activate
pip install -e .
pip install -e ".[cockpit,s3,sftp]"
mkdir -p dist/binary
pyinstaller -y --clean --distpath=dist/binary scripts/borg.exe.spec
# build sdist and wheel in dist/...
Expand Down
3 changes: 2 additions & 1 deletion scripts/borg.exe.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ basepath = os.path.abspath(os.path.join(here, '..'))
if is_win32:
hiddenimports = ['borghash']
else:
hiddenimports = ['borg.platform.posix', 'borghash']
hiddenimports = ['borg.platform.posix', 'borghash', 'rich._unicode_data.unicode17-0-0']

block_cipher = None

Expand All @@ -21,6 +21,7 @@ a = Analysis([os.path.join(basepath, 'src', 'borg', '__main__.py'), ],
binaries=[],
datas=[
(os.path.join(basepath, 'src', 'borg', 'paperkey.html'), 'borg'),
(os.path.join(basepath, 'src', 'borg', 'cockpit', 'cockpit.tcss'), os.path.join('borg', 'cockpit')),
],
hiddenimports=hiddenimports,
hookspath=[],
Expand Down