From 23c013bbacd14db1b726b8ad61a47294f7c75696 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 20 Mar 2026 22:42:24 -0700 Subject: [PATCH] Fix macOS CI and remove duplicate GitHub Actions workflow - Set AGENT_TOOLSDIRECTORY via step-level env on setup-python (not GITHUB_ENV which only applies to subsequent steps) - Use runner.temp for toolcache dir (always writable, no sudo needed) - Remove .github/workflows/build.yml to prevent duplicate CI runs - Remove unused Windows env check step Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitea/workflows/build.yml | 15 +--- .github/workflows/build.yml | 141 ------------------------------------ 2 files changed, 2 insertions(+), 154 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index ad9b3a9..6cba64c 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -32,16 +32,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python toolcache (macOS) - if: matrix.platform == 'macos' - run: | - mkdir -p ${{ github.workspace }}/.toolcache - echo "AGENT_TOOLSDIRECTORY=${{ github.workspace }}/.toolcache" >> $GITHUB_ENV - - name: Set up Python uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VERSION }} + env: + AGENT_TOOLSDIRECTORY: ${{ runner.temp }}/toolcache - name: Install Python build tools run: python -m pip install --upgrade pip setuptools wheel @@ -97,13 +93,6 @@ jobs: run: | brew install --quiet create-dmg || true - - name: Install system dependencies (Windows) - if: matrix.platform == 'windows' - shell: powershell - run: | - # Ensure Visual Studio Build Tools are available (usually pre-installed on runners) - Write-Host "Windows build environment ready" - - name: Download sidecar artifact uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 7290873..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,141 +0,0 @@ -name: Build & Release - -on: - push: - branches: [main] - tags: ["v*"] - pull_request: - branches: [main] - workflow_dispatch: - -env: - PYTHON_VERSION: "3.11" - NODE_VERSION: "20" - -jobs: - build-sidecar: - name: Build sidecar (${{ matrix.target }}) - runs-on: ${{ matrix.runner }} - strategy: - fail-fast: false - matrix: - include: - - runner: ubuntu-20.04 - target: x86_64-unknown-linux-gnu - platform: linux - - runner: windows-latest - target: x86_64-pc-windows-msvc - platform: windows - - runner: macos-13 - target: x86_64-apple-darwin - platform: macos-intel - - runner: macos-14 - target: aarch64-apple-darwin - platform: macos-arm - - steps: - - uses: actions/checkout@v4 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: ${{ env.PYTHON_VERSION }} - - - name: Build sidecar - working-directory: python - run: python build_sidecar.py --cpu-only - - - name: Upload sidecar artifact - uses: actions/upload-artifact@v4 - with: - name: sidecar-${{ matrix.target }} - path: python/dist/voice-to-notes-sidecar/ - retention-days: 7 - - build-tauri: - name: Build app (${{ matrix.target }}) - needs: build-sidecar - runs-on: ${{ matrix.runner }} - strategy: - fail-fast: false - matrix: - include: - - runner: ubuntu-20.04 - target: x86_64-unknown-linux-gnu - platform: linux - - runner: windows-latest - target: x86_64-pc-windows-msvc - platform: windows - - runner: macos-13 - target: x86_64-apple-darwin - platform: macos-intel - - runner: macos-14 - target: aarch64-apple-darwin - platform: macos-arm - - steps: - - uses: actions/checkout@v4 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_VERSION }} - cache: npm - - - name: Install Rust stable - uses: dtolnay/rust-toolchain@stable - - - name: Install system dependencies (Linux) - if: matrix.platform == 'linux' - run: | - sudo apt-get update - sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf - - - name: Download sidecar artifact - uses: actions/download-artifact@v4 - with: - name: sidecar-${{ matrix.target }} - path: src-tauri/binaries/ - - - name: Make sidecar executable (Unix) - if: matrix.platform != 'windows' - run: chmod +x src-tauri/binaries/voice-to-notes-sidecar-${{ matrix.target }} - - - name: Install npm dependencies - run: npm ci - - - name: Build Tauri app - run: npm run tauri build - env: - TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} - TAURI_CONFIG: '{"bundle":{"externalBin":["binaries/voice-to-notes-sidecar"]}}' - - - name: Upload app artifacts (Linux) - if: matrix.platform == 'linux' - uses: actions/upload-artifact@v4 - with: - name: app-${{ matrix.target }} - path: | - src-tauri/target/release/bundle/deb/*.deb - src-tauri/target/release/bundle/appimage/*.AppImage - retention-days: 30 - - - name: Upload app artifacts (Windows) - if: matrix.platform == 'windows' - uses: actions/upload-artifact@v4 - with: - name: app-${{ matrix.target }} - path: | - src-tauri/target/release/bundle/msi/*.msi - src-tauri/target/release/bundle/nsis/*.exe - retention-days: 30 - - - name: Upload app artifacts (macOS) - if: startsWith(matrix.platform, 'macos') - uses: actions/upload-artifact@v4 - with: - name: app-${{ matrix.target }} - path: | - src-tauri/target/release/bundle/dmg/*.dmg - src-tauri/target/release/bundle/macos/*.app - retention-days: 30 -- 2.47.3