Bump version to 0.7.0, fix CI workflows, add ci-build-and-release script

- Fix macOS workflow: correct Rust action, use xcodebuild, add --no-sign
- Remove direct release upload from both CI workflows (use draft releases)
- Add ci-build-and-release.sh to trigger builds and upload artifacts
- Update CLAUDE.md with CI build and release process

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: StuartCameronCode

.github/workflows/build-macos.yml

@@ -19,12 +19,7 @@ on:
           - arm64
           - x64
           - both
-        default: both
-      upload_to_release:
-        description: 'Upload to GitHub release'
-        required: false
-        type: boolean
-        default: true
+        default: arm64
 
 jobs:
   build:
@@ -37,14 +32,12 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.27.0'
           channel: 'stable'
           cache: true
 
       - name: Setup Rust
-        uses: dtolnay/rust-action@stable
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
           targets: aarch64-apple-darwin,x86_64-apple-darwin
 
       - name: Cache Rust dependencies
@@ -90,6 +83,10 @@ jobs:
           echo "Dependencies extracted:"
           ls -la deps/
 
+      - name: Setup CocoaPods
+        run: |
+          gem install cocoapods
+
       - name: Update version numbers
         run: |
           VERSION="${{ inputs.version }}"
@@ -127,33 +124,44 @@ jobs:
           cd app
           flutter pub get
           dart run build_runner build --delete-conflicting-outputs
-          flutter build macos --release
+
+          # Two-step xcodebuild — flutter build macos fails with module dependency errors
+          cd macos
+          rm -rf Pods Podfile.lock
+          pod install
+
+          # Build Pods-Runner scheme first (all CocoaPods dependencies)
+          xcodebuild -workspace Runner.xcworkspace -scheme Pods-Runner \
+              -configuration Release build ONLY_ACTIVE_ARCH=NO \
+              -quiet
+
+          # Build Runner for arm64 only (must match Podfile ARCHS setting)
+          xcodebuild -workspace Runner.xcworkspace -scheme Runner \
+              -configuration Release build ARCHS=arm64 ONLY_ACTIVE_ARCH=YES \
+              -quiet
+
+          # Copy to Flutter build location
+          DERIVED_APP=$(find ~/Library/Developer/Xcode/DerivedData/Runner-*/Build/Products/Release/vapourbox.app -maxdepth 0 2>/dev/null | head -1)
+          if [ -z "$DERIVED_APP" ]; then
+              echo "ERROR: Could not find built app in DerivedData"
+              exit 1
+          fi
+          mkdir -p ../build/macos/Build/Products/Release
+          cp -R "$DERIVED_APP" ../build/macos/Build/Products/Release/
 
       - name: Package release (arm64)
         if: ${{ inputs.arch == 'arm64' || inputs.arch == 'both' }}
         run: |
-          VERSION="${{ inputs.version }}"
-          ./Scripts/package-macos.sh --version "$VERSION" --arch arm64 --skip-build
+          ./Scripts/package-macos.sh --version "${{ inputs.version }}" --arch arm64 --skip-build --no-sign
 
       - name: Package release (x64)
         if: ${{ inputs.arch == 'x64' || inputs.arch == 'both' }}
         run: |
-          VERSION="${{ inputs.version }}"
-          ./Scripts/package-macos.sh --version "$VERSION" --arch x64 --skip-build
+          ./Scripts/package-macos.sh --version "${{ inputs.version }}" --arch x64 --skip-build --no-sign
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: VapourBox-${{ inputs.version }}-macos
-          path: dist/VapourBox-${{ inputs.version }}-macos-*.zip
+          path: dist/VapourBox-${{ inputs.version }}-macos-*.dmg
 
-      - name: Upload to release
-        if: ${{ inputs.upload_to_release }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          for f in dist/VapourBox-${{ inputs.version }}-macos-*.zip; do
-            if [ -f "$f" ]; then
-              gh release upload "v${{ inputs.version }}" "$f" --clobber || echo "Release may not exist yet"
-            fi
-          done

.github/workflows/build-windows.yml

@@ -11,11 +11,6 @@ on:
         description: 'Deps release tag (e.g., deps-v1.0.0)'
         required: true
         type: string
-      upload_to_release:
-        description: 'Upload to GitHub release'
-        required: false
-        type: boolean
-        default: true
 
 jobs:
   build:
@@ -194,9 +189,3 @@ jobs:
           name: VapourBox-${{ inputs.version }}-windows-x64
           path: dist/VapourBox-${{ inputs.version }}-windows-x64.zip
 
-      - name: Upload to release
-        if: ${{ inputs.upload_to_release }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload "v${{ inputs.version }}" "dist/VapourBox-${{ inputs.version }}-windows-x64.zip" --clobber || echo "Release may not exist yet"

CLAUDE.md

@@ -1401,6 +1401,7 @@ The release system automates the entire process of creating releases for both ma
 | Script | Purpose |
 |--------|---------|
 | `Scripts/release.sh` | Main orchestrator - runs the full release process |
+| `Scripts/ci-build-and-release.sh` | Trigger CI builds, download artifacts, upload to draft release |
 | `Scripts/get-github-version.sh` | Fetch latest versions from GitHub releases |
 | `Scripts/update-version.sh` | Update version across all project files |
 | `Scripts/check-deps-changed.sh` | Detect if dependencies changed since last release |
@@ -1416,6 +1417,8 @@ The release system automates the entire process of creating releases for both ma
 | `.github/workflows/build-windows.yml` | Build Windows app remotely |
 | `.github/workflows/build-macos.yml` | Build macOS app remotely |
 
+Both workflows produce build artifacts only — they do **not** upload directly to releases. Use `ci-build-and-release.sh` to trigger them, download artifacts, and upload to a draft release.
+
 ### Quick Start
 
 Run from macOS to create a full release:
@@ -1433,6 +1436,33 @@ This will:
 6. Trigger GitHub Actions for Windows build
 7. Create draft GitHub release
 
+### CI Build and Release
+
+To build both platforms via GitHub Actions and attach artifacts to a draft release:
+
+```bash
+# Full flow: trigger builds, wait, download artifacts, upload to draft release
+./Scripts/ci-build-and-release.sh --version 0.7.0
+
+# With custom deps tag and both macOS architectures
+./Scripts/ci-build-and-release.sh --version 0.7.0 --deps-tag deps-v1.1.0 --arch both
+
+# Just download latest artifacts and upload (don't trigger new builds)
+./Scripts/ci-build-and-release.sh --version 0.7.0 --skip-trigger
+```
+
+Prerequisites:
+- A draft release must already exist for the version tag (e.g., `v0.7.0`)
+- `gh` CLI installed and authenticated
+- Deps tag defaults to the value in `app/assets/deps-version.json`
+
+The script:
+1. Verifies the draft release exists
+2. Triggers Build Windows and Build macOS workflows
+3. Waits for both to complete (fails if either fails)
+4. Downloads artifacts to `dist/ci-artifacts/`
+5. Uploads `.zip` and `.dmg` files to the draft release
+
 ### Script Details
 
 #### `Scripts/get-github-version.sh`
@@ -1538,29 +1568,35 @@ If you prefer manual control:
    ./Scripts/update-version.sh --app 0.2.0 --deps 1.1.0 --deps-tag deps-v1.1.0
    ```
 
-6. **Build apps:**
+6. **Create draft release:**
    ```bash
-   # macOS
-   cd worker && cargo build --release
-   cd ../app && flutter pub get && flutter build macos --release
-   ./Scripts/package-macos.sh --version 0.2.0 --skip-build
+   gh release create v0.2.0 \
+     --title "VapourBox 0.2.0" \
+     --draft
+   ```
 
-   # Windows (via GitHub Actions or on Windows machine)
-   gh workflow run build-windows.yml -f version=0.2.0 -f deps_tag=deps-v1.1.0
+7. **Build via CI and upload artifacts:**
+   ```bash
+   # Triggers both macOS and Windows builds, waits, downloads, uploads to draft
+   ./Scripts/ci-build-and-release.sh --version 0.2.0 --deps-tag deps-v1.1.0
    ```
 
-7. **Create app release:**
+   Or build locally (macOS only) and trigger Windows separately:
    ```bash
-   gh release create v0.2.0 \
-     --title "VapourBox 0.2.0" \
-     --draft \
-     dist/VapourBox-0.2.0-macos-*.zip
+   # macOS local build
+   cd worker && cargo build --release
+   cd ../app && flutter pub get && flutter build macos --release
+   ./Scripts/package-macos.sh --version 0.2.0 --skip-build
+   gh release upload v0.2.0 dist/VapourBox-0.2.0-macos-arm64.dmg
    ```
 
+8. **Publish:** Review the draft release and publish when ready.
+
 ### Cross-Platform Notes
 
-- **Flutter Windows on macOS**: Not possible natively. Use GitHub Actions or Windows machine.
-- **Flutter macOS on Windows**: Not possible natively. Use GitHub Actions or macOS machine.
+- **Flutter Windows on macOS**: Not possible natively. Use GitHub Actions.
+- **Flutter macOS on macOS CI**: Uses GitHub Actions free tier (200 mins/month for public repos).
 - **Deps packaging**: Windows deps can be zipped on macOS if `deps/windows-x64/` exists.
+- **CI builds are unsigned**: macOS DMGs from CI are ad-hoc signed. For distribution, sign locally or set up code signing secrets in CI.
 
 ---