upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-02-18 18:19:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9327 from ThomasWaldmann/fixes-master

Browse source 
Misc. fixes (master)
This commit is contained in:
TW 2026-02-17 15:16:02 +01:00 committed by GitHub
commit 4e3352ed58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View file

@ -148,9 +148,9 @@ jobs:
]
}' || '{
"include": [
{"os": "ubuntu-22.04", "python-version": "3.11", "toxenv": "py311-llfuse", "binary": "borg-linux-glibc235-x86_64-gh"},
{"os": "ubuntu-22.04-arm", "python-version": "3.11", "toxenv": "py311-llfuse", "binary": "borg-linux-glibc235-arm64-gh"},
{"os": "ubuntu-24.04", "python-version": "3.12", "toxenv": "py312-pyfuse3"},
{"os": "ubuntu-22.04", "python-version": "3.11", "toxenv": "py311-pyfuse3", "binary": "borg-linux-glibc235-x86_64-gh"},
{"os": "ubuntu-22.04-arm", "python-version": "3.11", "toxenv": "py311-pyfuse3", "binary": "borg-linux-glibc235-arm64-gh"},
{"os": "ubuntu-24.04", "python-version": "3.12", "toxenv": "py312-llfuse"},
{"os": "ubuntu-24.04", "python-version": "3.13", "toxenv": "py313-pyfuse3"},
{"os": "ubuntu-24.04", "python-version": "3.14", "toxenv": "py314-mfusepy"},
{"os": "macos-15-intel", "python-version": "3.11", "toxenv": "py311-none", "binary": "borg-macos-15-x86_64-gh"},

0
scripts/Dockerfile.linux-tox → scripts/Dockerfile.linux-run
View file

2
scripts/borg.exe.spec
View file

@ -27,7 +27,7 @@ a = Analysis([os.path.join(basepath, 'src', 'borg', '__main__.py'), ],
hookspath=[],
runtime_hooks=[],
excludes=[
'_ssl', 'ssl',
# '_ssl', 'ssl', # do not exclude these, needed for pyfuse3/trio
'pkg_resources', # avoid pkg_resources related warnings
],
win_no_prefer_redirects=False,

2
scripts/linux-run
View file

@ -74,7 +74,7 @@ if [[ "$REBUILD" == "true" ]] || ! podman image exists "$FULL_IMAGE_NAME"; then
podman build \
--build-arg BASE_IMAGE="$BASE_IMAGE" \
-t "$FULL_IMAGE_NAME" \
-f scripts/Dockerfile.linux-tox .
-f scripts/Dockerfile.linux-run .
fi
echo "Running in container..."