chore: enable building x86_64-apple-darwin in release pipeline

Author: itstauq

.github/workflows/draft-release.yml

@@ -17,9 +17,7 @@ jobs:
       matrix:
         include:
           - args: "aarch64-apple-darwin"
-            arch: "silicon"
-          # - args: "x86_64-apple-darwin"
-          #   arch: "intel"
+          - args: "x86_64-apple-darwin"
     env:
       APPLE_ID: ${{ secrets.APPLE_ID }}
       APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
@@ -31,8 +29,12 @@ jobs:
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
+        with:
+          ssh-key: ${{ secrets.TEMP_SSH_KEY }}
+          submodules: recursive
 
       - name: Import signing certificate into keychain
+        if: ${{ runner.os }} == 'macOS'
         uses: apple-actions/import-codesign-certs@v3
         with:
           p12-file-base64: ${{ secrets.SIGNING_CERTIFICATE_P12_DATA }}
@@ -50,6 +52,22 @@ jobs:
           targets: ${{ matrix.args }}
           components: rust-src, rustfmt, clippy
 
+      - name: Install target
+        run: |
+          rustup target add ${{ matrix.args }}
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "^3.13"
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          cache: true
+          go-version-file: src-syftbox/go.mod
+          cache-dependency-path: src-syftbox/go.sum
+
       - name: Cache Bun dependencies
         uses: actions/cache@v4
         with:
@@ -78,8 +96,16 @@ jobs:
         run: bun install --cwd src-frontend
 
       - name: Build app
+        if: ${{ runner.os }} == 'macOS'
         run: |
-          GITHUB_CI=1 just package
+          GITHUB_CI=1 just package TARGET_TRIPLE=${{ matrix.args }}
+
+          # Move the artifacts to the artifacts directory
+          mkdir -p artifacts
+          mv src-tauri/target/release/bundle/dmg/*.dmg artifacts/SyftBox-${{ matrix.args }}.dmg
+          mv src-tauri/target/release/bundle/macos/*.app artifacts/SyftBox-${{ matrix.args }}.app
+          mv src-tauri/target/release/bundle/macos/*.app.tar.gz artifacts/SyftBox-${{ matrix.args }}.app.tar.gz
+          mv src-tauri/target/release/bundle/macos/*.app.tar.gz.sig artifacts/SyftBox-${{ matrix.args }}.app.tar.gz.sig
 
       - name: Setup git config
         env:
@@ -100,21 +126,18 @@ jobs:
       #   run: just deploy-frontend-to-stage
 
       - name: Create release
-        uses: softprops/action-gh-release@v2
+        uses: ncipollo/release-action@v1
         with:
-          tag_name: ${{ inputs.version }}
+          tag: ${{ inputs.version }}
           name: ${{ inputs.version }}
           draft: true
-          generate_release_notes: true
-          make_latest: true
-          files: |
-            ./src-tauri/target/release/bundle/dmg/*.dmg
-            ./src-tauri/target/release/bundle/macos/*.app
-            ./src-tauri/target/release/bundle/macos/*.app.tar.gz
-            ./src-tauri/target/release/bundle/macos/*.app.tar.gz.sig
+          allowUpdates: true
+          generateReleaseNotes: true
+          makeLatest: true
+          artifacts: ./artifacts/*.dmg,./artifacts/*.app,./artifacts/*.app.tar.gz,./artifacts/*.app.tar.gz.sig
 
       - name: Clean up all user keychains
-        if: always()
+        if: always() && ${{ runner.os }} == 'macOS'
         run: |
           # List all keychains
           keychains=$(security list-keychains | tr -d '" "')

.github/workflows/publish-release.yml

@@ -28,8 +28,12 @@ jobs:
             "pub_date": "${{ github.event.release.published_at }}",
             "platforms": {
               "darwin-aarch64": {
-                "signature": "$(curl -fsSL $(gh release view ${{ github.event.release.tag_name }} --json assets --jq '.assets[] | select(.name=="SyftBox.app.tar.gz.sig") | .url'))",
-                "url": "$(gh release view ${{ github.event.release.tag_name }} --json assets --jq '.assets[] | select(.name=="SyftBox.app.tar.gz") | .url')"
+                "signature": "$(curl -fsSL $(gh release view ${{ github.event.release.tag_name }} --json assets --jq '.assets[] | select(.name=="SyftBox-aarch64-apple-darwin.app.tar.gz.sig") | .url'))",
+                "url": "$(gh release view ${{ github.event.release.tag_name }} --json assets --jq '.assets[] | select(.name=="SyftBox-aarch64-apple-darwin.app.tar.gz") | .url')"
+              },
+              "darwin-x86_64": {
+                "signature": "$(curl -fsSL $(gh release view ${{ github.event.release.tag_name }} --json assets --jq '.assets[] | select(.name=="SyftBox-x86_64-apple-darwin.app.tar.gz.sig") | .url'))",
+                "url": "$(gh release view ${{ github.event.release.tag_name }} --json assets --jq '.assets[] | select(.name=="SyftBox-x86_64-apple-darwin.app.tar.gz") | .url')"
               }
             }
           }

justfile

@@ -240,21 +240,21 @@ dev-frontend:
 
 # Build the frontend, bridge and desktop app and package them into a single installable.
 [group('package')]
-package:
+package TARGET_TRIPLE="":
     #!/usr/bin/env python
     import subprocess
     import sys
 
     try:
         subprocess.run(["just", "package-frontend", "desktop_build=yes"], check=True)
-        subprocess.run(["just", "package-bridge"], check=True)
-        subprocess.run(["just", "package-desktop"], check=True)
+        subprocess.run(["just", "package-bridge", "{{ TARGET_TRIPLE }}"], check=True)
+        subprocess.run(["just", "package-desktop", "{{ TARGET_TRIPLE }}"], check=True)
     except subprocess.CalledProcessError as e:
         sys.exit(e.returncode)
 
 # Build the bridge and package it into a single installable.
 [group('package')]
-package-bridge:
+package-bridge TARGET_TRIPLE="":
     #!/usr/bin/env python
     import os
     import platform
@@ -264,21 +264,29 @@ package-bridge:
     from pathlib import Path
 
     try:
-        # Run the build command
-        subprocess.run(['just', '--justfile=src-syftbox/justfile', 'build-client-target'], check=True)
-
-        # Get target triple
-        rustc_output = subprocess.run(['rustc', '-Vv'], capture_output=True, text=True).stdout
-        target_triple = None
-        for line in rustc_output.splitlines():
-            if 'host:' in line:
-                target_triple = line.split('host:')[1].strip()
-                break
+        target_triple = "{{ TARGET_TRIPLE }}"
+        if not target_triple:
+            # Get target triple
+            rustc_output = subprocess.run(['rustc', '-Vv'], capture_output=True, text=True).stdout
+            target_triple = None
+            for line in rustc_output.splitlines():
+                if 'host:' in line:
+                    target_triple = line.split('host:')[1].strip()
+                    break
 
         if not target_triple:
             print(f"{{ _red }}Failed to determine the target triple. Please check the Rust installation.{{ _nc }}")
             sys.exit(1)
 
+        # Run the build command
+        if target_triple == "aarch64-apple-darwin":
+            subprocess.run(['just', '--justfile=src-syftbox/justfile', 'build-client-target', 'darwin', 'arm64'], check=True)
+        elif target_triple == "x86_64-apple-darwin":
+            subprocess.run(['just', '--justfile=src-syftbox/justfile', 'build-client-target', 'darwin', 'amd64'], check=True)
+        else:
+            # The command will automatically determine the target triple
+            subprocess.run(['just', '--justfile=src-syftbox/justfile', 'build-client-target'], check=True)
+
         # Determine extension
         extension = '.exe' if platform.system() == 'Windows' else ''
 
@@ -293,26 +301,37 @@ package-bridge:
             print(f"{{ _red }}No client binary found in src-syftbox/.out{{ _nc }}")
             sys.exit(1)
 
-        for client_file in client_files:
-            shutil.copy2(client_file, dst)
+        shutil.copy2(client_files[0], dst)
     except subprocess.CalledProcessError as e:
         sys.exit(e.returncode)
 
 # Build the desktop app and package it into a single installable.
 [group('package')]
-package-desktop:
+package-desktop TARGET_TRIPLE="":
     #!/usr/bin/env python
     import os
     import subprocess
     import sys
 
     env = os.environ.copy()
+    target_triple = "{{ TARGET_TRIPLE }}"
+    if not target_triple:
+        # Get target triple
+        rustc_output = subprocess.run(['rustc', '-Vv'], capture_output=True, text=True).stdout
+        for line in rustc_output.splitlines():
+            if 'host:' in line:
+                target_triple = line.split('host:')[1].strip()
+                break
+
+    if not target_triple:
+        print(f"{{ _red }}Failed to determine the target triple. Please check the Rust installation.{{ _nc }}")
+        sys.exit(1)
 
     try:
         if env.get('GITHUB_CI') == '1':
             env['CI'] = 'false'
             env['TAURI_BUNDLER_DMG_IGNORE_CI'] = 'true'
-            subprocess.run(['bunx', '@tauri-apps/cli', 'build'], env=env, check=True)
+            subprocess.run(['bunx', '@tauri-apps/cli', 'build', "--ci", "--target", target_triple], env=env, check=True)
         else:
             env['TAURI_SIGNING_PRIVATE_KEY'] = 'dummy'
             env['TAURI_SIGNING_PRIVATE_KEY_PASSWORD'] = 'dummy'
@@ -409,13 +428,26 @@ deploy-frontend-to-stage:
 
 # Update version numbers
 [group('utils')]
-update-version:
+update-version TARGET_TRIPLE="":
     #!/usr/bin/env python
     import json
     import re
     import subprocess
     from pathlib import Path
 
+    target_triple = "{{ TARGET_TRIPLE }}"
+    if not target_triple:
+        # Get target triple
+        rustc_output = subprocess.run(['rustc', '-Vv'], capture_output=True, text=True).stdout
+        for line in rustc_output.splitlines():
+            if 'host:' in line:
+                target_triple = line.split('host:')[1].strip()
+                break
+
+    if not target_triple:
+        print(f"{{ _red }}Failed to determine the target triple. Please check the Rust installation.{{ _nc }}")
+        sys.exit(1)
+
     # Get versions
     with open('src-frontend/package.json') as f:
         frontend_version = json.load(f)['version']
@@ -424,7 +456,7 @@ update-version:
         desktop_version = json.load(f)['version']
 
     # Find and get daemon version
-    daemon_path = next(Path('src-tauri/target/binaries').glob('syftbox_client*'))
+    daemon_path = next(Path('src-tauri/binaries').glob(f'syftbox_client-{target_triple}*'))
     daemon_output = subprocess.run([str(daemon_path), '--version'], capture_output=True, text=True).stdout
     daemon_version = re.search(r'version ([0-9]+\.[0-9]+\.[0-9]+(?:-[a-zA-Z0-9]+)*)', daemon_output).group(1)
 
@@ -572,7 +604,8 @@ setup skip_prerequisites="no":
         # Try common locations
         home = str(Path.home())
         possible_paths = [
-            os.path.join(home, '.bun', 'bin', 'bun'),
+            os.path.join(home, '.bun', 'bin', 'bun'),                 # Unix
+            os.path.join(home, '.bun', 'bin', 'bun.exe'),             # Windows
             os.path.join(home, 'AppData', 'Local', 'bun', 'bun.exe')  # Windows
         ]
 

src-frontend/lib/analytics/index.tsx

@@ -43,7 +43,7 @@ export function AnalyticsProvider({
 }) {
   // If we want to replace Aptabase in the future, we'd modify this component
   return (
-    <AptabaseProvider appKey={appKey}>
+    <AptabaseProvider appKey={appKey} options={{ appVersion: "0.1.6" }}>
       <AnalyticsConsumer>{children}</AnalyticsConsumer>
     </AptabaseProvider>
   );