Explorar o código

Consolidate image and boot uploads into single Images bundle; update summary

TheWildJames hai 10 meses
pai
achega
269c31f181
Modificáronse 1 ficheiros con 49 adicións e 32 borrados
  1. 49 32
      .github/workflows/build.yml

+ 49 - 32
.github/workflows/build.yml

@@ -705,7 +705,7 @@ jobs:
           compression-level: 9
 
       - name: Upload Boot Image
-        if: hashFiles('*-boot.img') != ''
+        if: ${{ false }}
         id: upload_boot
         uses: actions/upload-artifact@v4
         with:
@@ -715,7 +715,7 @@ jobs:
           compression-level: 9
           
       - name: Upload Boot Image (GZ)
-        if: hashFiles('*-boot-gz.img') != ''
+        if: ${{ false }}
         id: upload_boot_gz
         uses: actions/upload-artifact@v4
         with:
@@ -725,7 +725,7 @@ jobs:
           compression-level: 9
           
       - name: Upload Boot Image (LZ4)
-        if: hashFiles('*-boot-lz4.img') != ''
+        if: ${{ false }}
         id: upload_boot_lz4
         uses: actions/upload-artifact@v4
         with:
@@ -735,6 +735,7 @@ jobs:
           compression-level: 9
           
       - name: Upload Raw Image
+        if: ${{ false }}
         id: upload_image_raw
         uses: actions/upload-artifact@v4
         with:
@@ -744,6 +745,7 @@ jobs:
           compression-level: 9
           
       - name: Upload Raw Image (GZ)
+        if: ${{ false }}
         id: upload_image_gz
         uses: actions/upload-artifact@v4
         with:
@@ -753,6 +755,7 @@ jobs:
           compression-level: 9
           
       - name: Upload Raw Image (LZ4)
+        if: ${{ false }}
         id: upload_image_lz4
         uses: actions/upload-artifact@v4
         with:
@@ -761,6 +764,32 @@ jobs:
             Image.lz4
           compression-level: 9
 
+      - name: Prepare Images Bundle
+        run: |
+          set -e
+          mkdir -p images_bundle
+          # Copy kernel images if present
+          for f in Image Image.gz Image.lz4; do
+            if [ -f "$f" ]; then
+              cp "$f" images_bundle/
+            fi
+          done
+          # Copy boot images if present
+          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" images_bundle/
+            fi
+          done
+
+      - name: Upload Images Bundle
+        if: hashFiles('images_bundle/**') != ''
+        id: upload_images_bundle
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.FILE_NAME }}-Images
+          path: images_bundle/
+          compression-level: 9
+
       - name: Upload Build Diagnostics
         if: ${{ always() }}
         id: upload_rejects
@@ -866,12 +895,7 @@ jobs:
         env:
           FILE_NAME: ${{ env.FILE_NAME }}
           AK3_ID: ${{ steps.upload_ak3.outputs.artifact-id }}
-          BOOT_ID: ${{ steps.upload_boot.outputs.artifact-id }}
-          BOOT_GZ_ID: ${{ steps.upload_boot_gz.outputs.artifact-id }}
-          BOOT_LZ4_ID: ${{ steps.upload_boot_lz4.outputs.artifact-id }}
-          IMG_RAW_ID: ${{ steps.upload_image_raw.outputs.artifact-id }}
-          IMG_GZ_ID: ${{ steps.upload_image_gz.outputs.artifact-id }}
-          IMG_LZ4_ID: ${{ steps.upload_image_lz4.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
@@ -895,29 +919,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 Images" >> $GITHUB_STEP_SUMMARY
-          for f in "${FILE_NAME}-boot.img" "${FILE_NAME}-boot-gz.img" "${FILE_NAME}-boot-lz4.img"; do
-            if [ -f "$f" ]; then status="✅"; else status="❌"; fi
-            case "$f" in
-              *boot.img) name="Boot Image (RAW)"; id="$BOOT_ID";;
-              *boot-gz.img) name="Boot Image (GZ)"; id="$BOOT_GZ_ID";;
-              *boot-lz4.img) name="Boot Image (LZ4)"; id="$BOOT_LZ4_ID";;
-            esac
-            LINK_SUFFIX=$(link_if_available "$status" "$id" "$f")
-            echo "- **$name**: $status $f${LINK_SUFFIX}" >> $GITHUB_STEP_SUMMARY
-          done
-
-          echo "### Kernel Images" >> $GITHUB_STEP_SUMMARY
-          for f in "Image" "Image.gz" "Image.lz4"; do
-            if [ -f "$f" ]; then status="✅"; else status="❌"; fi
-            case "$f" in
-              Image) name="Kernel Image (RAW)"; id="$IMG_RAW_ID";;
-              Image.gz) name="Kernel Image (GZ)"; id="$IMG_GZ_ID";;
-              Image.lz4) name="Kernel Image (LZ4)"; id="$IMG_LZ4_ID";;
-            esac
-            LINK_SUFFIX=$(link_if_available "$status" "$id" "$f")
-            echo "- **$name**: $status $f${LINK_SUFFIX}" >> $GITHUB_STEP_SUMMARY
-          done
+          echo "### Images Bundle" >> $GITHUB_STEP_SUMMARY
+          if [ -d "images_bundle" ] && [ "$(ls -A images_bundle 2>/dev/null)" ]; then
+            BUNDLE_STATUS="✅"
+          else
+            BUNDLE_STATUS="❌"
+          fi
+          LINK_SUFFIX=$(link_if_available "$BUNDLE_STATUS" "$IMAGES_BUNDLE_ID" "${FILE_NAME}-Images")
+          echo "- **Bundle**: $BUNDLE_STATUS ${FILE_NAME}-Images${LINK_SUFFIX}" >> $GITHUB_STEP_SUMMARY
+          if [ "$BUNDLE_STATUS" = "✅" ]; then
+            echo "  Included:" >> $GITHUB_STEP_SUMMARY
+            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 "images_bundle/$f" ]; then
+                echo "  - $f" >> $GITHUB_STEP_SUMMARY
+              fi
+            done
+          fi
 
           echo "### Diagnostics" >> $GITHUB_STEP_SUMMARY
           # Only link diagnostics if uploaded