Merge pull request #306 from automagik-dev/fix/sccache-incremental

fix(ci): disable incremental compilation for sccache

Author: namastex888

.github/workflows/build-all-platforms.yml

@@ -40,13 +40,13 @@ jobs:
           - os: [self-hosted, Linux, X64]  # Self-hosted runner on ct200 with Docker
             target: x86_64-unknown-linux-gnu
             platform: linux-x64
-            container: ghcr.io/namastexlabs/forge-builder:nightly-2025-12-04
+            container_image: ghcr.io/namastexlabs/forge-builder:nightly-2025-12-04
             cargo_jobs: 20  # ct200 has 20 cores
           - os: [self-hosted, Linux, X64]  # Self-hosted runner on ct200 with Docker (cross-compile)
             target: aarch64-unknown-linux-gnu
             platform: linux-arm64
             use-zigbuild: true
-            container: ghcr.io/namastexlabs/forge-builder:nightly-2025-12-04
+            container_image: ghcr.io/namastexlabs/forge-builder:nightly-2025-12-04
             cargo_jobs: 20  # ct200 has 20 cores
           # Android builds moved to separate workflow (build-android-apk.yml)
           - os: [self-hosted, Windows, X64]  # Self-hosted runner on ct201
@@ -67,7 +67,7 @@ jobs:
             cargo_jobs: 3  # GitHub-hosted M1 has 3 cores
 
     runs-on: ${{ matrix.os }}
-    container: ${{ matrix.container }}
+    container: ${{ matrix.container_image || '' }}
 
     steps:
       - uses: actions/checkout@v4
@@ -128,6 +128,7 @@ jobs:
         run: |
           echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
           echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
+          echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV  # sccache doesn't work with incremental compilation
 
       - name: Cache Rust dependencies
         if: env.SKIP_BUILD != 'true'
@@ -359,6 +360,13 @@ jobs:
           path: npx-cli/dist/${{ matrix.platform }}/
           overwrite: true
 
+      # Fix file ownership for subsequent jobs on self-hosted runners
+      # Docker containers run as root, creating root-owned files that the runner user can't clean up
+      - name: Fix file ownership (Linux containers)
+        if: always() && matrix.container_image
+        shell: bash
+        run: chown -R 1000:1000 $GITHUB_WORKSPACE || true
+
   # Android builds moved to separate workflow: build-android-apk.yml
   # This allows Android to have its own release timeline
 

.github/workflows/release.yml

@@ -189,30 +189,57 @@ jobs:
           git push origin HEAD
           git push origin --tags
 
-      - name: Create matching forge-core tag
+      - name: Sync forge-core version and create tag
         if: needs.gate.outputs.action != 'promote'
         continue-on-error: true
         env:
           GH_TOKEN: ${{ secrets.PAT_TOKEN }}
         run: |
+          VERSION="${{ steps.bump.outputs.version }}"
           TAG="${{ steps.bump.outputs.tag }}"
-          echo "Creating tag $TAG in namastexlabs/forge-core..."
-
-          # Get main branch SHA from forge-core
-          SHA=$(gh api repos/namastexlabs/forge-core/git/refs/heads/main --jq '.object.sha')
+          echo "Syncing forge-core to version $VERSION and creating tag $TAG..."
 
           # Check if tag already exists
           if gh api repos/namastexlabs/forge-core/git/refs/tags/$TAG 2>/dev/null; then
             echo "Tag $TAG already exists in forge-core, skipping"
             exit 0
           fi
 
-          # Create the tag reference
-          gh api repos/namastexlabs/forge-core/git/refs \
-            -f ref="refs/tags/$TAG" \
-            -f sha="$SHA"
+          # Trigger sync-version-from-forge workflow which:
+          # 1. Updates [workspace.package] version in Cargo.toml using cargo set-version
+          # 2. Commits the change
+          # 3. Creates an annotated tag pointing at the versioned commit
+          echo "Triggering sync-version-from-forge workflow..."
+          gh workflow run sync-version-from-forge.yml \
+            --repo namastexlabs/forge-core \
+            -f version="$VERSION"
+
+          # Wait for workflow to start and complete
+          echo "Waiting for sync workflow to complete..."
+          sleep 15
+
+          # Poll for workflow completion (max 2 minutes)
+          for i in {1..24}; do
+            STATUS=$(gh run list --repo namastexlabs/forge-core \
+              --workflow=sync-version-from-forge.yml \
+              --limit=1 --json status,conclusion \
+              --jq '.[0] | "\(.status) \(.conclusion)"')
+
+            echo "Attempt $i: $STATUS"
+
+            if [[ "$STATUS" == "completed success" ]]; then
+              echo "✅ forge-core version synced and tag $TAG created"
+              exit 0
+            elif [[ "$STATUS" == "completed failure" ]] || [[ "$STATUS" == "completed cancelled" ]]; then
+              echo "❌ Sync workflow failed: $STATUS"
+              exit 1
+            fi
+
+            sleep 5
+          done
 
-          echo "Created forge-core tag $TAG at $SHA"
+          echo "⚠️ Timed out waiting for sync workflow"
+          exit 1
 
   # Build (skip for promote action)
   build: