From d73a88ebbed165e3605e40316046f663ec82ead0 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Feb 2026 18:12:28 +0100 Subject: [PATCH 1/3] rename Dockerfile to match script name --- scripts/{Dockerfile.linux-tox => Dockerfile.linux-run} | 0 scripts/linux-run | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename scripts/{Dockerfile.linux-tox => Dockerfile.linux-run} (100%) diff --git a/scripts/Dockerfile.linux-tox b/scripts/Dockerfile.linux-run similarity index 100% rename from scripts/Dockerfile.linux-tox rename to scripts/Dockerfile.linux-run diff --git a/scripts/linux-run b/scripts/linux-run index c56f8db65..1e0b0ccf1 100755 --- a/scripts/linux-run +++ b/scripts/linux-run @@ -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..." From de51d2446446261a8e14010f9a48e7506a47084d Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Feb 2026 18:14:52 +0100 Subject: [PATCH 2/3] pyinstaller binary: do not exclude ssl, needed for pyfuse3/trio, fixes #9196 --- scripts/borg.exe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/borg.exe.spec b/scripts/borg.exe.spec index 5ab0fbbd3..cc332ad0b 100644 --- a/scripts/borg.exe.spec +++ b/scripts/borg.exe.spec @@ -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, From d537f0d80dbe5db06a81c55e17db1a8b38a40a98 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Feb 2026 18:18:31 +0100 Subject: [PATCH 3/3] CI: build linux binaries with pyfuse3 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f9590cff..e7edf1337 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,9 +145,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"},