فهرست منبع

Split consolidated Images bundle into two: '-Boot' and '-Image' with updated summary links

TheWildJames 10 ماه پیش
والد
کامیت
d2d9209b42
1فایلهای تغییر یافته به همراه53 افزوده شده و 23 حذف شده
  1. 53 23
      .github/workflows/build.yml

+ 53 - 23
.github/workflows/build.yml

@@ -764,30 +764,42 @@ jobs:
             Image.lz4
           compression-level: 9
 
-      - name: Prepare Images Bundle
+      - name: Prepare Boot Bundle
         run: |
           set -e
-          mkdir -p images_bundle
-          # Copy kernel images if present
-          for f in Image Image.gz Image.lz4; do
+          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" images_bundle/
+              cp "$f" "${{ env.FILE_NAME }}-Boot/"
             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
+
+      - 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" images_bundle/
+              cp "$f" "${{ env.FILE_NAME }}-Image/"
             fi
           done
 
-      - name: Upload Images Bundle
-        if: hashFiles('images_bundle/**') != ''
-        id: upload_images_bundle
+      - name: Upload Image Bundle
+        if: hashFiles('${{ env.FILE_NAME }}-Image/**') != ''
+        id: upload_image_bundle
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.FILE_NAME }}-Images
-          path: images_bundle/
+          name: ${{ env.FILE_NAME }}-Image
+          path: ${{ env.FILE_NAME }}-Image/
           compression-level: 9
 
       - name: Upload Build Diagnostics
@@ -895,7 +907,8 @@ jobs:
         env:
           FILE_NAME: ${{ env.FILE_NAME }}
           AK3_ID: ${{ steps.upload_ak3.outputs.artifact-id }}
-          IMAGES_BUNDLE_ID: ${{ steps.upload_images_bundle.outputs.artifact-id }}
+          BOOT_BUNDLE_ID: ${{ steps.upload_boot_bundle.outputs.artifact-id }}
+          IMAGE_BUNDLE_ID: ${{ steps.upload_image_bundle.outputs.artifact-id }}
           REJECTS_ID: ${{ steps.upload_rejects.outputs.artifact-id }}
         run: |
           # Add artifact summary with presence verification
@@ -919,18 +932,35 @@ 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 "### Images Bundle" >> $GITHUB_STEP_SUMMARY
-          if [ -d "images_bundle" ] && [ "$(ls -A images_bundle 2>/dev/null)" ]; then
-            BUNDLE_STATUS="✅"
+          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="✅"
           else
-            BUNDLE_STATUS="❌"
+            IMAGE_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
+          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
             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
+            for f in "Image" "Image.gz" "Image.lz4"; do
+              if [ -f "${FILE_NAME}-Image/$f" ]; then
                 echo "  - $f" >> $GITHUB_STEP_SUMMARY
               fi
             done