feat(build): add macos intel build

Author: will7200

.github/workflows/release.yaml

@@ -66,16 +66,24 @@ jobs:
       - name: Install Build Dependencies
         run: |
           python -m pip install pyinstaller --user
-      - name: Build Windows
-        id: windows_build
-        if: ${{ matrix.os == 'windows-latest' }}
+      - name: Build
+        id: build
         run: |
-          python scripts/createmsi.py
-          echo "##[set-output name=msi;]$(ls *.msi)"
-      - name: Upload MSI
-        if: ${{ matrix.os == 'windows-latest' }}
+          if [ "$RUNNER_OS" == "Windows" ]; then
+            python scripts/createmsi.py
+            echo "build=$(ls *.msi)" >> $GITHUB_OUTPUT
+          elif [ "$RUNNER_OS" == "macOS" ]; then
+            export PATH=$PATH:/Users/runner/.local/bin
+            python scripts/create_macos_package.py
+            echo "build=$(ls *.pkg)" >> $GITHUB_OUTPUT
+          else
+            echo "$RUNNER_OS not supported"
+            exit 1
+          fi
+        shell: bash
+      - name: Upload
         uses: softprops/action-gh-release@v2
         with:
-          files: ${{ steps.windows_build.outputs.msi }}
+          files: ${{ steps.build.outputs.build }}
 
 

activity-browser.spec

@@ -80,7 +80,7 @@ if platform.system() == "Darwin":
         target,
         name="Activity Browser.app",
         icon="activity_browser/static/icons/activity-browser.icns",
-        bundle_identifier=None,
+        bundle_identifier="com.github.lca_activity_browser.activity_browser",
         version=os.environ.get("VERSION", "0.0.0"),
         info_plist={
             "NSPrincipalClass": "NSApplication",

scripts/create_macos_package.py

@@ -0,0 +1,48 @@
+import platform
+import shutil
+import subprocess
+import sys
+
+
+def build_app():
+    pyinstaller = shutil.which("pyinstaller")
+    if not pyinstaller:
+        print("ERROR: This script requires pyinstaller.")
+        sys.exit(1)
+
+    pyinst_cmd = [
+        pyinstaller,
+        "activity-browser.spec",
+        "--clean",
+        "-y"
+    ]
+    subprocess.check_call(pyinst_cmd)
+
+
+def build_macos_package(application_path='dist/Activity Browser.app', package_path='./Activity Browser-{}.pkg',
+                        sign_identity: str=None):
+    macos_architecture = 'intel' if platform.processor() == 'i386' else 'arm'
+    build_cmd = [
+        'pkgbuild',
+        '--component',
+        application_path,
+        "--install-location",
+        '/Applications',
+        package_path.format(macos_architecture)
+    ]
+    if sign_identity:
+        build_cmd = build_cmd[0] + ['--sign', sign_identity] + build_cmd[1:]
+    subprocess.check_call(build_cmd)
+
+
+if __name__ == "__main__":
+    import argparse
+
+    if not shutil.which("pyinstaller"):
+        subprocess.check_call(["pip", "install", "--upgrade", "pyinstaller"])
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--sign-identity", help="signing identity")
+    options = parser.parse_args()
+    build_app()
+    build_macos_package(sign_identity=options.sign_identity)