build: fix macos build script

.github/workflows/release_github.yml

@@ -53,47 +53,17 @@ jobs:
           name: release_dist_python
           path: dist
 
-  build_mac_x64:
+  build_mac:
     needs: build_python
-    runs-on: macos-15-intel
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Load release python requirements
-        uses: actions/download-artifact@v4
-        with:
-          name: release_dist_reqs
-          path: build
-
-      - uses: actions/setup-python@v6
-        with:
-          python-version: ${{ env.BUILD_PYTHON_VERSION }}
+    strategy:
+      matrix:
+        include:
+          - arch: x64
+            runner: macos-15-intel
+          - arch: arm64
+            runner: macos-15
+    runs-on: ${{ matrix.runner }}
 
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 20
-
-      - name: Install requirements
-        run: |
-          brew install gnu-sed graphicsmagick imagemagick
-          npm install --global create-dmg
-
-      - name: Build
-        run: |
-          bash scripts/pyinstaller/build_mac.sh
-          bash scripts/macos/build_dmg.sh
-          # Remove directory produced by pyinstaller
-          bash -c 'find dist -maxdepth 1 -mindepth 1 -type d -exec rm -r {} \;'
-
-      - name: Save release binaries for macos x64
-        uses: actions/upload-artifact@v4
-        with:
-          name: release_dist_bin_macos_x64
-          path: dist
-
-  build_mac_arm64:
-    needs: build_python
-    runs-on: macos-15
     steps:
       - uses: actions/checkout@v6
 
@@ -123,10 +93,10 @@ jobs:
           # Remove directory produced by pyinstaller
           bash -c 'find dist -maxdepth 1 -mindepth 1 -type d -exec rm -r {} \;'
 
-      - name: Save release binaries for macos arm64
+      - name: Save release binaries for macos ${{ matrix.arch }}
         uses: actions/upload-artifact@v4
         with:
-          name: release_dist_bin_macos_arm64
+          name: release_dist_bin_macos_${{ matrix.arch }}
           path: dist
 
   build_win:
@@ -196,7 +166,7 @@ jobs:
 
   release:
     if: github.event_name == 'push' || github.event.inputs.tag != ''
-    needs: [build_win, build_mac_x64, build_mac_arm64, build_appimage]
+    needs: [build_win, build_mac, build_appimage]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

scripts/pyinstaller/build_mac.sh

@@ -12,7 +12,7 @@ else
     VLC_URL="https://get.videolan.org/vlc/3.0.21/macosx/vlc-3.0.21-intel64.dmg"
 fi
 
-PYINSTALLER_VERSION="6.16.0"
+PYINSTALLER_VERSION="6.17.0"
 
 mkdir -p "$BUILD_DIR"
 
@@ -39,8 +39,7 @@ pyinstaller --clean --noconfirm "$BUILD_DIR/$APP_NAME.spec"
 
 echo "Embedding VLC"
 
-mkdir -p "$BUILD_DIR/libVLC"
-VLC_EMBED_SRC=$(realpath "$BUILD_DIR/libVLC")
+VLC_EMBED_SRC=$(realpath "$BUILD_DIR")/libVLC
 
 if [ ! -d "$VLC_EMBED_SRC" ]; then
     wget -q -nc -O "$BUILD_DIR/vlc.dmg" "$VLC_URL" || true