Simplify: upload image and boot files directly as one '-Images' artifact; update summary accordingly

.github/workflows/build.yml

@@ -764,42 +764,19 @@ jobs:
             Image.lz4
           compression-level: 9
 
-      - name: Prepare Boot Bundle
-        run: |
-          set -e
-          mkdir -p "${{ env.FILE_NAME }}-Boot"
-          for f in "${{ env.FILE_NAME }}-boot.img" "${{ env.FILE_NAME }}-boot-gz.img" "${{ env.FILE_NAME }}-boot-lz4.img"; do
-            if [ -f "$f" ]; then
-              cp "$f" "${{ env.FILE_NAME }}-Boot/"
-            fi
-          done
-
-      - name: Upload Boot Bundle
-        if: hashFiles('${{ env.FILE_NAME }}-Boot/**') != ''
-        id: upload_boot_bundle
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.FILE_NAME }}-Boot
-          path: ${{ env.FILE_NAME }}-Boot/
-          compression-level: 9
-
-      - name: Prepare Image Bundle
-        run: |
-          set -e
-          mkdir -p "${{ env.FILE_NAME }}-Image"
-          for f in Image Image.gz Image.lz4; do
-            if [ -f "$f" ]; then
-              cp "$f" "${{ env.FILE_NAME }}-Image/"
-            fi
-          done
-
-      - name: Upload Image Bundle
-        if: hashFiles('${{ env.FILE_NAME }}-Image/**') != ''
-        id: upload_image_bundle
+      - name: Upload Images (files from workspace)
+        id: upload_images_bundle
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.FILE_NAME }}-Image
-          path: ${{ env.FILE_NAME }}-Image/
+          name: ${{ env.FILE_NAME }}-Images
+          path: |
+            Image
+            Image.gz
+            Image.lz4
+            ${{ env.FILE_NAME }}-boot.img
+            ${{ env.FILE_NAME }}-boot-gz.img
+            ${{ env.FILE_NAME }}-boot-lz4.img
+          if-no-files-found: ignore
           compression-level: 9
 
       - name: Upload Build Diagnostics
@@ -907,8 +884,7 @@ jobs:
         env:
           FILE_NAME: ${{ env.FILE_NAME }}
           AK3_ID: ${{ steps.upload_ak3.outputs.artifact-id }}
-          BOOT_BUNDLE_ID: ${{ steps.upload_boot_bundle.outputs.artifact-id }}
-          IMAGE_BUNDLE_ID: ${{ steps.upload_image_bundle.outputs.artifact-id }}
+          IMAGES_BUNDLE_ID: ${{ steps.upload_images_bundle.outputs.artifact-id }}
           REJECTS_ID: ${{ steps.upload_rejects.outputs.artifact-id }}
         run: |
           # Add artifact summary with presence verification
@@ -932,35 +908,22 @@ jobs:
           LINK_SUFFIX=$(link_if_available "$AK3_STATUS" "$AK3_ID" "${FILE_NAME}-AnyKernel3")
           echo "- **AnyKernel3**: $AK3_STATUS ${FILE_NAME}-AnyKernel3${LINK_SUFFIX}" >> $GITHUB_STEP_SUMMARY
 
-          echo "### Boot Bundle" >> $GITHUB_STEP_SUMMARY
-          if [ -d "${FILE_NAME}-Boot" ] && [ "$(ls -A \"${FILE_NAME}-Boot\" 2>/dev/null)" ]; then
-            BOOT_STATUS="✅"
-          else
-            BOOT_STATUS="❌"
-          fi
-          LINK_SUFFIX=$(link_if_available "$BOOT_STATUS" "$BOOT_BUNDLE_ID" "${FILE_NAME}-Boot")
-          echo "- **Bundle**: $BOOT_STATUS ${FILE_NAME}-Boot${LINK_SUFFIX}" >> $GITHUB_STEP_SUMMARY
-          if [ "$BOOT_STATUS" = "✅" ]; then
-            echo "  Included:" >> $GITHUB_STEP_SUMMARY
-            for f in "${FILE_NAME}-boot.img" "${FILE_NAME}-boot-gz.img" "${FILE_NAME}-boot-lz4.img"; do
-              if [ -f "${FILE_NAME}-Boot/$f" ]; then
-                echo "  - $f" >> $GITHUB_STEP_SUMMARY
-              fi
-            done
-          fi
-
-          echo "### Image Bundle" >> $GITHUB_STEP_SUMMARY
-          if [ -d "${FILE_NAME}-Image" ] && [ "$(ls -A \"${FILE_NAME}-Image\" 2>/dev/null)" ]; then
-            IMAGE_STATUS="✅"
+          echo "### Images (uploaded files)" >> $GITHUB_STEP_SUMMARY
+          FILES_PRESENT=0
+          for f in "Image" "Image.gz" "Image.lz4" "${FILE_NAME}-boot.img" "${FILE_NAME}-boot-gz.img" "${FILE_NAME}-boot-lz4.img"; do
+            if [ -f "$f" ]; then FILES_PRESENT=$((FILES_PRESENT+1)); fi
+          done
+          if [ "$FILES_PRESENT" -gt 0 ]; then
+            IMAGES_STATUS="✅"
           else
-            IMAGE_STATUS="❌"
+            IMAGES_STATUS="❌"
           fi
-          LINK_SUFFIX=$(link_if_available "$IMAGE_STATUS" "$IMAGE_BUNDLE_ID" "${FILE_NAME}-Image")
-          echo "- **Bundle**: $IMAGE_STATUS ${FILE_NAME}-Image${LINK_SUFFIX}" >> $GITHUB_STEP_SUMMARY
-          if [ "$IMAGE_STATUS" = "✅" ]; then
+          LINK_SUFFIX=$(link_if_available "$IMAGES_STATUS" "$IMAGES_BUNDLE_ID" "${FILE_NAME}-Images")
+          echo "- **Set**: $IMAGES_STATUS ${FILE_NAME}-Images${LINK_SUFFIX}" >> $GITHUB_STEP_SUMMARY
+          if [ "$IMAGES_STATUS" = "✅" ]; then
             echo "  Included:" >> $GITHUB_STEP_SUMMARY
-            for f in "Image" "Image.gz" "Image.lz4"; do
-              if [ -f "${FILE_NAME}-Image/$f" ]; then
+            for f in "Image" "Image.gz" "Image.lz4" "${FILE_NAME}-boot.img" "${FILE_NAME}-boot-gz.img" "${FILE_NAME}-boot-lz4.img"; do
+              if [ -f "$f" ]; then
                 echo "  - $f" >> $GITHUB_STEP_SUMMARY
               fi
             done