Merge pull request #9327 from ThomasWaldmann/fixes-master

Misc. fixes (master)

Author: ThomasWaldmann

.github/workflows/ci.yml

@@ -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"},

scripts/Dockerfile.linux-tox scripts/Dockerfile.linux-runscripts/Dockerfile.linux-tox renamed to scripts/Dockerfile.linux-run

@@ -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,

scripts/borg.exe.spec

@@ -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..."