determine cache type from pkg_type

QaidVoid · QaidVoid · commit 4f7ee766118b · 2026-01-08T10:35:23.000+05:45
diff --git a/.github/workflows/build-on-change.yaml b/.github/workflows/build-on-change.yaml
@@ -70,7 +70,8 @@ jobs:
             # Manual trigger with specific recipe
             if [ -f "${{ inputs.recipe_path }}" ]; then
               RECIPE="${{ inputs.recipe_path }}"
-              CHANGED_RECIPES=$(jq -n --arg path "$RECIPE" '[{"path": $path}]')
+              pkg_type=$(grep -E "^pkg_type:" "$RECIPE" | head -1 | sed 's/pkg_type:[[:space:]]*//; s/^["'"'"']//; s/["'"'"']$//' || echo "")
+              CHANGED_RECIPES=$(jq -n --arg path "$RECIPE" --arg pkg_type "$pkg_type" '[{"path": $path, "pkg_type": $pkg_type}]')
             else
               echo "::error::Recipe not found: ${{ inputs.recipe_path }}"
               exit 1
@@ -92,10 +93,11 @@ jobs:
             echo "Changed files:"
             echo "$CHANGED_FILES"
 
-            # Build JSON array of changed recipes
+            # Build JSON array of changed recipes with pkg_type
             for file in $CHANGED_FILES; do
               if [ -f "$file" ]; then
-                CHANGED_RECIPES=$(echo "$CHANGED_RECIPES" | jq --arg path "$file" '. + [{"path": $path}]')
+                pkg_type=$(grep -E "^pkg_type:" "$file" | head -1 | sed 's/pkg_type:[[:space:]]*//; s/^["'"'"']//; s/["'"'"']$//' || echo "")
+                CHANGED_RECIPES=$(echo "$CHANGED_RECIPES" | jq --arg path "$file" --arg pkg_type "$pkg_type" '. + [{"path": $path, "pkg_type": $pkg_type}]')
               fi
             done
           fi
@@ -117,6 +119,7 @@ jobs:
 
           echo "$CHANGED_RECIPES" | jq -c '.[]' | while read -r recipe; do
             path=$(echo "$recipe" | jq -r '.path')
+            pkg_type=$(echo "$recipe" | jq -r '.pkg_type')
             pkg_name=$(basename "$(dirname "$path")")
 
             # Skip cache check if force rebuild
@@ -139,7 +142,7 @@ jobs:
               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"
+                echo "::notice::Skipping $pkg_name - already built with same hash" >&2
                 continue
               fi
             fi
@@ -172,7 +175,7 @@ jobs:
     uses: ./.github/workflows/matrix_builds.yaml
     with:
       sbuild-url: "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/${{ matrix.recipe.path }}"
-      ghcr-url: ${{ contains(matrix.recipe.path, 'packages/') && format('ghcr.io/{0}/pkgcache', github.repository_owner) || format('ghcr.io/{0}/bincache', github.repository_owner) }}
+      ghcr-url: ghcr.io/${{ github.repository_owner }}
       pkg-family: ${{ github.event.repository.name }}
       rebuild: true
       logs: true
diff --git a/.github/workflows/manual-build.yaml b/.github/workflows/manual-build.yaml
@@ -15,14 +15,6 @@ on:
           - x86_64-Linux
           - aarch64-Linux
         default: 'x86_64-Linux'
-      cache_type:
-        description: 'Cache type (auto-detected from path if not specified)'
-        type: choice
-        options:
-          - auto
-          - bincache
-          - pkgcache
-        default: 'auto'
 
 jobs:
   validate:
@@ -80,7 +72,7 @@ jobs:
     with:
       host: ${{ inputs.host }}
       sbuild-url: "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/${{ needs.validate.outputs.recipe }}"
-      ghcr-url: ${{ contains(needs.validate.outputs.recipe, 'packages/') && format('ghcr.io/{0}/pkgcache', github.repository_owner) || format('ghcr.io/{0}/bincache', github.repository_owner) }}
+      ghcr-url: ghcr.io/${{ github.repository_owner }}
       pkg-family: ${{ github.event.repository.name }}
       rebuild: true
       logs: true
diff --git a/.github/workflows/pr-build-test.yaml b/.github/workflows/pr-build-test.yaml
@@ -73,7 +73,8 @@ jobs:
 
           for file in $CHANGED_FILES; do
             if [ -f "$file" ]; then
-              CHANGED_RECIPES=$(echo "$CHANGED_RECIPES" | jq --arg path "$file" '. + [{"path": $path}]')
+              pkg_type=$(grep -E "^pkg_type:" "$file" | head -1 | sed 's/pkg_type:[[:space:]]*//; s/^["'"'"']//; s/["'"'"']$//' || echo "")
+              CHANGED_RECIPES=$(echo "$CHANGED_RECIPES" | jq --arg path "$file" --arg pkg_type "$pkg_type" '. + [{"path": $path, "pkg_type": $pkg_type}]')
             fi
           done
 
@@ -100,7 +101,7 @@ jobs:
     with:
       host: ${{ inputs.host }}
       sbuild-url: "https://raw.githubusercontent.com/${{ github.repository }}/${{ needs.detect-changes.outputs.pr_head_sha }}/${{ matrix.recipe.path }}"
-      ghcr-url: ${{ contains(matrix.recipe.path, 'packages/') && format('ghcr.io/{0}/pkgcache', github.repository_owner) || format('ghcr.io/{0}/bincache', github.repository_owner) }}
+      ghcr-url: ghcr.io/${{ github.repository_owner }}
       pkg-family: ${{ github.event.repository.name }}
       rebuild: true
       logs: true
@@ -242,12 +243,6 @@ jobs:
               pkg_family=$(echo "$recipe_path" | cut -d'/' -f2)
               recipe_name=$(basename "$recipe_path" .yaml 2>/dev/null || echo "unknown")
 
-              # Determine cache type from path
-              if echo "$recipe_path" | grep -q "^packages/"; then
-                CACHE_TYPE="pkgcache"
-              else
-                CACHE_TYPE="bincache"
-              fi
 
               case "$status" in
                 success)
diff --git a/.github/workflows/release-metadata.yaml b/.github/workflows/release-metadata.yaml
@@ -53,24 +53,48 @@ jobs:
           }
           chmod +x /usr/local/bin/soarql
 
+      - name: Filter recipes by pkg_type
+        run: |
+          mkdir -p /tmp/bincache-recipes /tmp/pkgcache-recipes /tmp/output
+
+          # Find all recipes and filter by pkg_type
+          for recipe in $(find binaries packages -name "*.yaml" -type f 2>/dev/null); do
+            pkg_type=$(grep -E "^pkg_type:" "$recipe" | head -1 | sed 's/pkg_type:[[:space:]]*//; s/^["'"'"']//; s/["'"'"']$//' || echo "")
+
+            # Create directory structure and copy recipe
+            rel_path=$(dirname "$recipe")
+            if [ "$pkg_type" = "static" ] || [ "$pkg_type" = "dynamic" ]; then
+              mkdir -p "/tmp/bincache-recipes/$rel_path"
+              cp "$recipe" "/tmp/bincache-recipes/$recipe"
+            else
+              mkdir -p "/tmp/pkgcache-recipes/$rel_path"
+              cp "$recipe" "/tmp/pkgcache-recipes/$recipe"
+            fi
+          done
+
+          echo "=== Bincache recipes (static/dynamic) ==="
+          find /tmp/bincache-recipes -name "*.yaml" 2>/dev/null | wc -l
+
+          echo "=== Pkgcache recipes (other pkg_types) ==="
+          find /tmp/pkgcache-recipes -name "*.yaml" 2>/dev/null | wc -l
+
       - name: Generate bincache metadata
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          mkdir -p /tmp/output
-
-          # Note: For test repo, the packages are pushed to bincache-test
-          # sbuild-meta will look for ghcr.io/pkgforge/bincache-test/<pkg>
-          sbuild-meta generate \
-            --arch "${{ matrix.arch }}" \
-            --recipes ./binaries \
-            --output /tmp/output \
-            --cache-type bincache \
-            --parallel 4 \
-            --ghcr-owner pkgforge-dev \
-            --github-token "$GITHUB_TOKEN" || {
-            echo "::warning::bincache metadata generation failed or no packages found"
-          }
+          # Generate metadata for static/dynamic packages (bincache)
+          if [ -n "$(find /tmp/bincache-recipes -name '*.yaml' 2>/dev/null)" ]; then
+            sbuild-meta generate \
+              --arch "${{ matrix.arch }}" \
+              --recipes /tmp/bincache-recipes \
+              --output /tmp/output \
+              --cache-type bincache \
+              --parallel 4 \
+              --ghcr-owner pkgforge-dev \
+              --github-token "$GITHUB_TOKEN" || {
+              echo "::warning::bincache metadata generation failed or no packages found"
+            }
+          fi
 
           # Rename to include cache type
           if [ -f "/tmp/output/bincache/${{ matrix.arch }}.json" ]; then
@@ -85,16 +109,19 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          sbuild-meta generate \
-            --arch "${{ matrix.arch }}" \
-            --recipes ./packages \
-            --output /tmp/output \
-            --cache-type pkgcache \
-            --parallel 4 \
-            --ghcr-owner pkgforge-dev \
-            --github-token "$GITHUB_TOKEN" || {
-            echo "::warning::pkgcache metadata generation failed or no packages found"
-          }
+          # Generate metadata for non-static/dynamic packages (pkgcache)
+          if [ -n "$(find /tmp/pkgcache-recipes -name '*.yaml' 2>/dev/null)" ]; then
+            sbuild-meta generate \
+              --arch "${{ matrix.arch }}" \
+              --recipes /tmp/pkgcache-recipes \
+              --output /tmp/output \
+              --cache-type pkgcache \
+              --parallel 4 \
+              --ghcr-owner pkgforge-dev \
+              --github-token "$GITHUB_TOKEN" || {
+              echo "::warning::pkgcache metadata generation failed or no packages found"
+            }
+          fi
 
           # Rename to include cache type
           if [ -f "/tmp/output/pkgcache/${{ matrix.arch }}.json" ]; then
diff --git a/.github/workflows/rolling-rebuilds.yaml b/.github/workflows/rolling-rebuilds.yaml
