Merge pull request #8 from RetroDECK/cooker

Cooker

Author: XargonWan

.github/workflows/update_components.yml .github/workflows/build_components.yml.github/workflows/update_components.yml renamed to .github/workflows/build_components.yml

@@ -1,4 +1,4 @@
-name: "Build RetroDECK Components"
+name: "Alchemic Circle: Build RetroDECK Components"
 
 on:
   push:
@@ -9,8 +9,8 @@ on:
 
   workflow_dispatch:
 
-  schedule:
-    - cron: '00 17 * * *' # 2:00 AM JST (JST is UTC+9, so 17:00 UTC)
+  # schedule:
+  #   - cron: '00 17 * * *' # 2:00 AM JST (JST is UTC+9, so 17:00 UTC)
 
 permissions:
   contents: write
@@ -31,22 +31,48 @@ jobs:
         run: |
           heavy=()
           light=()
-      
-          for recipe in */recipe.sh; do
-            if grep -q "flatpak_id_CULO" "$recipe"; then  #TODO: we might not need this anymore
-              heavy+=("$recipe")
+
+          # define here all the "source_url" that must be built on the "heavy" runner
+          heavy_list=()
+
+          for recipe in */component_recipe.json; do
+            # Skip if the glob didn't match any real file
+            [ -f "$recipe" ] || continue
+
+            # Extract the first source_url present in the recipe file (if any)
+            source_url=$(jq -r '..|objects|.source_url? // empty' "$recipe" | head -n1 || echo "")
+
+            # If heavy_list is defined and we have a source_url, check if the source_url is in the heavy_list
+            if [[ ${#heavy_list[@]} -gt 0 && -n "$source_url" ]]; then
+              matched=0
+              for h in "${heavy_list[@]}"; do
+                if [[ "$source_url" == "$h" ]]; then
+                  # assign directly to heavy and stop searching
+                  heavy+=("$(jq -n --arg r "$recipe" --arg c "$(basename "$(dirname "$recipe")")" '{recipe:$r,component:$c}')")
+                  matched=1
+                  break
+                fi
+              done
+
+              # if no match found, go to light
+              if [[ $matched -eq 0 ]]; then
+                light+=("$(jq -n --arg r "$recipe" --arg c "$(basename "$(dirname "$recipe")")" '{recipe:$r,component:$c}')")
+              fi
             else
-              light+=("$recipe")
+              # no heavy_list or no source_url -> default to light
+              light+=("$(jq -n --arg r "$recipe" --arg c "$(basename "$(dirname "$recipe")")" '{recipe:$r,component:$c}')")
             fi
           done
-      
-          heavy_json=$(printf '%s\n' "${heavy[@]}" | jq -R . | jq -s -c .)
-          light_json=$(printf '%s\n' "${light[@]}" | jq -R . | jq -s -c .)
-      
+
+          # Each entry in heavy/light is a raw JSON object string; combine them into a JSON array
+          heavy_json=$(printf '%s\n' "${heavy[@]}" | jq -s -c .)
+          light_json=$(printf '%s\n' "${light[@]}" | jq -s -c .)
+
           echo "heavy=$heavy_json" >> $GITHUB_OUTPUT
           echo "light=$light_json" >> $GITHUB_OUTPUT
 
   build-light:
+    name: "Build ${{ matrix.recipe.component }}"
     needs: setup-recipes
     runs-on: ubuntu-latest
     if: github.event_name != 'schedule' || github.ref == 'refs/heads/update/components'
@@ -96,20 +122,20 @@ jobs:
           git log -1 --oneline
 
       # Run Build
-      - name: Run Build Artifacts
+      - name: 'Alchemist: Run Build Artifacts'
         run: |
-          source automation-tools/utils.sh
-          artifact_name=$(basename $(dirname "${{ matrix.recipe }}"))
-          echo "artifact_name=$artifact_name" >> $GITHUB_ENV
-          bash "${{ matrix.recipe }}"
+          # Use the component name provided in the matrix entry
+          echo "artifact_name=${{ matrix.recipe.component }}" >> $GITHUB_ENV
+          automation-tools/alchemist/alchemist.sh -f "${{ matrix.recipe.recipe }}"
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: ${{ env.artifact_name }}/artifacts/*
-        
+
   build-heavy:
+    name: "Build ${{ matrix.recipe.component }}"
     needs: setup-recipes
     runs-on: retrodeck
     if: (github.event_name != 'schedule' || github.ref == 'refs/heads/update/components') && fromJSON(needs.setup-recipes.outputs.heavy-matrix).length > 0
@@ -156,12 +182,17 @@ jobs:
           git log -1 --oneline
 
       # Run Build
-      - name: Run Build Artifacts
+      - name: 'Alchemist: Run Build Artifacts'
         run: |
-          source automation-tools/utils.sh
-          artifact_name=$(basename $(dirname "${{ matrix.recipe }}"))
-          echo "artifact_name=$artifact_name" >> $GITHUB_ENV
-          bash "${{ matrix.recipe }}"
+          # Use the component name provided in the matrix entry
+          echo "artifact_name=${{ matrix.recipe.component }}" >> $GITHUB_ENV
+          automation-tools/alchemist/alchemist.sh -f "${{ matrix.recipe.recipe }}"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.artifact_name }}
+          path: ${{ env.artifact_name }}/artifacts/*
 
   Release_RetroDECK_Components:
     needs: [build-light, build-heavy]
@@ -200,13 +231,55 @@ jobs:
             fi
           done
 
-      - name: Generate components_version.md
+      - name: Generate components_version_list.md
         run: |
-          source automation-tools/utils.sh
+          # Loop through each <component_name> folder
+          for component_dir in */; do
+            # Skip automation-tools and other non-component directories
+            if [[ "$component_dir" == "automation-tools/" ]] || [[ "$component_dir" == "downloaded-artifacts/" ]]; then
+              continue
+            fi
+
+            # Path to artifacts directory
+            artifacts_dir="${component_dir}artifacts"
+
+            # Check if artifacts directory exists
+            if [[ -d "$artifacts_dir" ]]; then
+              # Look for tar.gz files in artifacts
+              for archive in "$artifacts_dir"/*.tar.gz; do
+                if [[ -f "$archive" ]]; then
+                  echo "Checking archive: $archive"
+
+                  # Check if archive contains component_version file
+                  fullpath=$(tar -tzf "$archive" | grep 'component_version' | head -n 1)
+                  if [[ -n "$fullpath" ]]; then
+                    echo "Extracting $fullpath from $archive"
+                    tar -xzf "$archive" -C "$component_dir" "$fullpath"
+
+                    # Clean up the ugly path (normalize it)
+                    extracted_path=$(realpath "$component_dir/$fullpath")
+                    normalized_path=$(realpath "$component_dir/component_version")
+
+                    # Check if $fullpath is exactly 'component_version' (no leading dirs)
+                    if [[ "$extracted_path" != "$normalized_path" ]]; then
+                      mv -f "$extracted_path" "$normalized_path"
+                    fi
+                  else
+                    echo "No component_version found in $archive"
+                    echo "DEBUG: Listing contents of $archive"
+                    tar -tzf "$archive"
+                  fi
+                fi
+              done
+            fi
+          done
+
+          # Source the write function and call it
+          source automation-tools/write_components_version.sh
           write_components_version
-          echo "Components version file generated."
-          cat components_version.md
 
+          # Show the resulting components_version_list.md file
+          cat components_version_list.md
       - name: Generate a token for Rekku
         id: generate-rekku-token
         uses: actions/create-github-app-token@v1
@@ -275,8 +348,8 @@ jobs:
           echo "This is a RetroDECK Components Artifacts release from [this commit](https://github.com/${{ github.repository }}/commit/${{ github.sha }}), from branch [${{ env.BRANCH_NAME }}](https://github.com/RetroDECK/RetroDECK/tree/feat/${{ env.BRANCH_NAME }})." >> "$RELEASE_BODY_FILE"
           echo "" >> "$RELEASE_BODY_FILE"
 
-          # Append the contents of components_version.md to the release body
-          cat components_version.md >> "$RELEASE_BODY_FILE"
+          # Append the contents of components_version_list.md to the release body
+          cat components_version_list.md >> "$RELEASE_BODY_FILE"
           echo "" >> "$RELEASE_BODY_FILE"
 
           # Prepare array
@@ -347,14 +420,14 @@ jobs:
           tag: "${{ env.TAG }}"
           name: "RetroDECK Components ${{ env.TAG }}"
           body: ${{ steps.generate-body.outputs.RELEASE_BODY }}
-          artifacts: "*/artifacts/*,!*/artifacts/version,components_version.md"
+          artifacts: "*/artifacts/*,!*/artifacts/component_version,components_version_list.md"
           allowUpdates: true
           omitBodyDuringUpdate: true
           makeLatest: ${{ env.MAKE_LATEST }}
           repo: ${{ env.REPO_NAME }}
           token: ${{ steps.generate-rekku-token.outputs.token }}
 
-      - name: Create diff between target branch and PR components_version.md
+      - name: Create diff between target branch and PR components_version_list.md
         run: |
           if [[ "${GITHUB_BASE_REF}" == "cooker" ]]; then
             TARGET_BRANCH="main"
@@ -363,18 +436,18 @@ jobs:
           fi
 
           git fetch origin $TARGET_BRANCH
-          if [ -f "components_version.md" ]; then
-            if git show origin/$TARGET_BRANCH:components_version.md > target_components_version.md 2>/dev/null; then
-              echo "Generating diff between $TARGET_BRANCH and PR components_version.md..."
-              diff -u target_components_version.md components_version.md > components_version_diff.txt || true
+          if [ -f "components_version_list.md" ]; then
+            if git show origin/$TARGET_BRANCH:components_version_list.md > target_components_version_list.md 2>/dev/null; then
+              echo "Generating diff between $TARGET_BRANCH and PR components_version_list.md..."
+              diff -u target_components_version_list.md components_version_list.md > components_version_diff.txt || true
               echo "Diff saved to components_version_diff.txt"
             else
-              echo "components_version.md does not exist on $TARGET_BRANCH branch. Skipping diff."
-              echo "No components_version.md on $TARGET_BRANCH branch." > components_version_diff.txt
+              echo "components_version_list.md does not exist on $TARGET_BRANCH branch. Skipping diff."
+              echo "No components_version_list.md on $TARGET_BRANCH branch." > components_version_diff.txt
             fi
               else
-            echo "components_version.md not found in PR. Skipping diff."
-            echo "No components_version.md in PR." > components_version_diff.txt
+            echo "components_version_list.md not found in PR. Skipping diff."
+            echo "No components_version_list.md in PR." > components_version_diff.txt
           fi
 
       - name: Write PR body
@@ -387,14 +460,15 @@ jobs:
           echo "## Changes:" >> pr_body.md
           echo "$(cat commits_list.txt)" >> pr_body.md
           echo "" >> pr_body.md
-          echo "## Diff between main and PR components_version.md:" >> pr_body.md
+          echo "## Diff between main and PR components_version_list.md:" >> pr_body.md
           echo "```diff" >> pr_body.md
           echo "$(cat components_version_diff.txt)" >> pr_body.md
           echo "```" >> pr_body.md
 
+      # Skipped on cooker as you cannot open PRs against the same branch
       - name: Open Pull Request
         uses: peter-evans/create-pull-request@v7
-        if: github.event_name != 'schedule' || github.ref == 'refs/heads/update/components' && github.head_ref != github.base_ref
+        if: (github.event_name != 'schedule' || github.ref == 'refs/heads/update/components') && github.head_ref != github.base_ref && env.BRANCH_NAME != 'cooker'
         with:
           token: ${{ steps.generate-rekku-token.outputs.token }}
           commit-message: "Update RetroDECK Components Artifacts"

.gitignore

@@ -1,4 +1,12 @@
 downloaded-artifacts
 */artifacts
 .tmpfunc
-grab.log
+*.log
+_work
+.flatpak-builder
+component_version
+components_version_list.md
+squashfs-root
+
+#just temporary until Alchemist is integrated here
+automation-tools/Alchemist-temp