update

Author: QaidVoid

.github/workflows/build-on-change.yaml

@@ -37,14 +37,29 @@ jobs:
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
     outputs:
-      changed_recipes: ${{ steps.detect.outputs.changed_recipes }}
-      has_changes: ${{ steps.detect.outputs.has_changes }}
+      changed_recipes: ${{ steps.filter.outputs.recipes_to_build }}
+      has_changes: ${{ steps.filter.outputs.has_changes }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
+      - name: Download tools
+        run: |
+          curl -fsSL "https://github.com/pkgforge/sbuilder/releases/download/latest/sbuild-linter-x86_64-linux" \
+            -o /usr/local/bin/sbuild-linter && chmod +x /usr/local/bin/sbuild-linter || true
+          curl -fsSL "https://github.com/pkgforge/sbuilder/releases/download/latest/sbuild-cache-x86_64-linux" \
+            -o /usr/local/bin/sbuild-cache && chmod +x /usr/local/bin/sbuild-cache || true
+
+      - name: Download build cache
+        continue-on-error: true
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release download build-cache -p build_cache.sdb -D /tmp/ --repo "${{ github.repository }}" || \
+            sbuild-cache --cache /tmp/build_cache.sdb init 2>/dev/null || true
+
       - name: Detect changed recipes
         id: detect
         run: |
@@ -87,12 +102,59 @@ jobs:
 
           # Output results
           RECIPE_COUNT=$(echo "$CHANGED_RECIPES" | jq 'length')
-          echo "Found $RECIPE_COUNT recipes to build"
+          echo "Found $RECIPE_COUNT changed recipes"
           echo "$CHANGED_RECIPES" | jq .
 
-          # Save to outputs
           echo "changed_recipes=$(echo "$CHANGED_RECIPES" | jq -c .)" >> $GITHUB_OUTPUT
 
+      - name: Filter already-built recipes
+        id: filter
+        run: |
+          CHANGED_RECIPES='${{ steps.detect.outputs.changed_recipes }}'
+          FORCE_REBUILD="${{ inputs.force_rebuild }}"
+          RECIPES_TO_BUILD="[]"
+          SKIPPED=0
+
+          echo "$CHANGED_RECIPES" | jq -c '.[]' | while read -r recipe; do
+            path=$(echo "$recipe" | jq -r '.path')
+            pkg_name=$(basename "$(dirname "$path")")
+
+            # Skip cache check if force rebuild
+            if [ "$FORCE_REBUILD" == "true" ]; then
+              echo "$recipe"
+              continue
+            fi
+
+            # Compute current recipe hash
+            if [ -f "$path" ] && command -v sbuild-linter &>/dev/null; then
+              current_hash=$(sbuild-linter hash --exclude-version "$path" 2>/dev/null || sha256sum "$path" | cut -d' ' -f1)
+            else
+              current_hash=$(sha256sum "$path" 2>/dev/null | cut -d' ' -f1 || echo "unknown")
+            fi
+
+            # Check if already built with same hash
+            if [ -f "/tmp/build_cache.sdb" ] && command -v sbuild-cache &>/dev/null; then
+              cached_info=$(sbuild-cache --cache /tmp/build_cache.sdb get --package "$pkg_name" --json 2>/dev/null || echo "")
+              cached_hash=$(echo "$cached_info" | jq -r '.recipe_hash // ""' 2>/dev/null || echo "")
+              cached_status=$(echo "$cached_info" | jq -r '.last_build_status // ""' 2>/dev/null || echo "")
+
+              if [ "$cached_hash" == "$current_hash" ] && [ "$cached_status" == "success" ]; then
+                echo "::notice::Skipping $pkg_name - already built with same hash"
+                continue
+              fi
+            fi
+
+            echo "$recipe"
+          done | jq -s '.' > /tmp/recipes_to_build.json
+
+          RECIPES_TO_BUILD=$(cat /tmp/recipes_to_build.json)
+          RECIPE_COUNT=$(echo "$RECIPES_TO_BUILD" | jq 'length')
+
+          echo "Recipes to build after filtering: $RECIPE_COUNT"
+          echo "$RECIPES_TO_BUILD" | jq .
+
+          echo "recipes_to_build=$(echo "$RECIPES_TO_BUILD" | jq -c .)" >> $GITHUB_OUTPUT
+
           if [ "$RECIPE_COUNT" -gt 0 ]; then
             echo "has_changes=true" >> $GITHUB_OUTPUT
           else
@@ -122,18 +184,22 @@ jobs:
     if: always() && needs.detect-changes.outputs.has_changes == 'true'
     runs-on: ubuntu-latest
     steps:
-      - name: Download sbuild-cache
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download tools
         run: |
           curl -fsSL "https://github.com/pkgforge/sbuilder/releases/download/latest/sbuild-cache-x86_64-linux" \
-            -o /usr/local/bin/sbuild-cache || exit 0
-          chmod +x /usr/local/bin/sbuild-cache
+            -o /usr/local/bin/sbuild-cache && chmod +x /usr/local/bin/sbuild-cache || true
+          curl -fsSL "https://github.com/pkgforge/sbuilder/releases/download/latest/sbuild-linter-x86_64-linux" \
+            -o /usr/local/bin/sbuild-linter && chmod +x /usr/local/bin/sbuild-linter || true
 
       - name: Download existing cache
         continue-on-error: true
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release download cache-latest -p build_cache.sdb -D /tmp/ --repo "${{ github.repository }}" || \
+          gh release download build-cache -p build_cache.sdb -D /tmp/ --repo "${{ github.repository }}" || \
             sbuild-cache --cache /tmp/build_cache.sdb init
 
       - name: Download build status artifacts
@@ -154,8 +220,21 @@ jobs:
             # Extract package name from path (e.g., binaries/hello/static.yaml -> hello)
             pkg_name=$(basename "$(dirname "$path")")
 
+            # Extract version from recipe's pkgver field
+            pkg_version="unknown"
+            if [ -f "$path" ]; then
+              pkg_version=$(grep -E "^pkgver:" "$path" | head -1 | sed 's/pkgver:[[:space:]]*//; s/^["'"'"']//; s/["'"'"']$//' || echo "unknown")
+              [ -z "$pkg_version" ] && pkg_version="unknown"
+            fi
+
+            # Compute recipe hash for cache
+            if [ -f "$path" ] && command -v sbuild-linter &>/dev/null; then
+              recipe_hash=$(sbuild-linter hash --exclude-version "$path" 2>/dev/null || sha256sum "$path" | cut -d' ' -f1)
+            else
+              recipe_hash=$(sha256sum "$path" 2>/dev/null | cut -d' ' -f1 || echo "unknown")
+            fi
+
             # Find build status from artifacts
-            # The recipe_url in the status JSON contains the path
             status="unknown"
 
             if [ -d "/tmp/build-statuses" ]; then
@@ -165,7 +244,6 @@ jobs:
                 recipe_url=$(jq -r '.recipe_url // ""' "$status_file" 2>/dev/null || echo "")
                 if echo "$recipe_url" | grep -q "$path"; then
                   file_status=$(jq -r '.status // "unknown"' "$status_file" 2>/dev/null || echo "unknown")
-                  # If any host failed, mark as failure
                   if [ "$file_status" = "failure" ]; then
                     status="failure"
                     break
@@ -181,11 +259,12 @@ jobs:
               status="${{ needs.build.result }}"
             fi
 
-            echo "Package: $pkg_name, Status: $status"
+            echo "Package: $pkg_name, Version: $pkg_version, Hash: ${recipe_hash:0:16}..., Status: $status"
 
             sbuild-cache --cache /tmp/build_cache.sdb update \
               --package "$pkg_name" \
-              --version "latest" \
+              --version "$pkg_version" \
+              --hash "$recipe_hash" \
               --status "$status" || true
           done
 
@@ -200,10 +279,11 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           if [ -f "/tmp/build_cache.sdb" ]; then
-            gh release upload cache-latest /tmp/build_cache.sdb --clobber --repo "${{ github.repository }}" || {
-              gh release create cache-latest \
+            gh release upload build-cache /tmp/build_cache.sdb --clobber --repo "${{ github.repository }}" || {
+              gh release create build-cache \
                 --title "Build Cache" \
                 --notes "Build cache for CI" \
+                --prerelease \
                 --repo "${{ github.repository }}" \
                 /tmp/build_cache.sdb
             }