binary build fixes

Author: ThomasWaldmann

.github/workflows/build-binary.yml

@@ -2,6 +2,7 @@ name: Build binaries
 
 on:
   push:
+    branches: [ 1.4-maint ]
     paths:
       - '**.py'
       - '**.pyx'
@@ -14,6 +15,7 @@ on:
       - 'requirements.d/*'
       - 'scripts/**'
   pull_request:
+    branches: [ 1.4-maint ]
     paths:
       - '**.py'
       - '**.pyx'
@@ -29,18 +31,18 @@ on:
 
 jobs:
   build-binary-macos:
-    name: Build (macOS ${{ matrix.os }} / ${{ runner.arch }})
+    name: Build (macOS ${{ matrix.os }} / ${{ matrix.arch }})
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12, macos-14]
+        include:
+          - os: macos-13
+            arch: X64
+          - os: macos-14
+            arch: ARM64
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
 
-    env:
-      # Support both Homebrew locations (Intel and Apple Silicon)
-      PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH"
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -63,57 +65,49 @@ jobs:
             ${{ runner.os }}-
 
       - name: Install macOS packages via Homebrew (see Brewfile)
-        run: |
-          brew bundle install
+        run: brew bundle install
 
       - name: Install Python requirements
         run: |
           python -m pip install --upgrade pip setuptools wheel
           pip install -r requirements.d/development.txt
 
       - name: Build Borg to compile extensions
-        env:
-          # Set both paths again to be sure nothing overrides them
-          PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:/usr/local/opt/openssl@3.0/lib/pkgconfig:${{ env.PKG_CONFIG_PATH }}"
-        run: |
-          pip install -ve .
+        run: pip install -ve .
 
-      - name: Build PyInstaller single-file binary
+      - name: Build Borg fat binaries using PyInstaller
         run: |
           python -m pip install 'pyinstaller==6.7.0'
           mkdir -p dist/binary
           pyinstaller --clean --distpath=dist/binary scripts/borg.exe.spec
-          pushd dist/binary
-          tar -czvf borg.tgz borg-dir
-          rm -rf borg-dir
-          popd
 
       - name: Smoke-test the built binary (borg -V)
         run: |
           pushd dist/binary
-          ls -l
-          # test single-file binary
+          echo "single-file binary"
           chmod +x borg.exe
           ./borg.exe -V
-          # test single-dir binary
-          tar -xzvf borg.tgz
+          echo "single-directory binary"
           chmod +x borg-dir/borg.exe
           ./borg-dir/borg.exe -V
+          tar czf borg.tgz borg-dir
           popd
 
       - name: Prepare artifacts
         run: |
           mkdir -p artifacts
           if [ -f dist/binary/borg.exe ]; then
-            cp dist/binary/borg.exe artifacts/borg-${{ matrix.os }}-${{ runner.arch }}
+            cp dist/binary/borg.exe artifacts/borg-${{ matrix.os }}-${{ matrix.arch }}.exe
           fi
           if [ -f dist/binary/borg.tgz ]; then
-            cp dist/binary/borg.tgz artifacts/borg-dir-${{ matrix.os }}-${{ runner.arch }}.tgz
+            cp dist/binary/borg.tgz artifacts/borg-${{ matrix.os }}-${{ matrix.arch }}.tgz
           fi
+          echo "artifact files"
+          ls -l artifacts/
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: borg-macos-${{ matrix.os }}-${{ runner.arch }}
+          name: borg-${{ matrix.os }}-${{ matrix.arch }}
           path: artifacts/*
           if-no-files-found: error