Update build-kernel-release.yml

Author: Bouteillepleine

.github/workflows/build-kernel-release.yml

@@ -44,9 +44,9 @@ on:
         description: "Choose SusFS Branch for android15-6.6"
         type: string
         default: "gki-android15-6.6"
-
+      
 jobs:
-  build-batch-1: # Non Bazel Builds
+  build-batch-1:
     name: build-batch-1 (${{ matrix.model }}, ${{ matrix.soc }}, ${{ matrix.branch }}, ${{ matrix.manifest }}, ${{ matrix.android_version }}, ${{ matrix.kernel_version }}, ${{ inputs.ksun_branch }})
     strategy:
       fail-fast: false
@@ -139,10 +139,12 @@ jobs:
           echo "susfs_branch=$SUSFS_BRANCH" >> $GITHUB_OUTPUT
 
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
 
       - name: Build Kernel
-        uses: ./.github/actions/
+        uses: ./.github/actions
         with:
           model: ${{ matrix.model }}
           soc: ${{ matrix.soc }}
@@ -152,9 +154,15 @@ jobs:
           kernel_version: ${{ matrix.kernel_version }}
           ksun_branch: ${{ inputs.ksun_branch }}
           susfs_branch: ${{ steps.get-susfs-branch.outputs.susfs_branch }}
+          
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.model }}-kernel
+          path: ${{ matrix.model }}/artifacts/
+          if-no-files-found: error
 
   build-batch-2:
-    # needs: build-batch-1
     name: build-batch-2 (${{ matrix.model }}, ${{ matrix.soc }}, ${{ matrix.branch }}, ${{ matrix.manifest }}, ${{ matrix.android_version }}, ${{ matrix.kernel_version }}, ${{ inputs.ksun_branch }})
     strategy:
       fail-fast: false
@@ -259,7 +267,9 @@ jobs:
           echo "susfs_branch=$SUSFS_BRANCH" >> $GITHUB_OUTPUT
 
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
 
       - name: Build Kernel
         uses: ./.github/actions
@@ -272,6 +282,13 @@ jobs:
           kernel_version: ${{ matrix.kernel_version }}
           ksun_branch: ${{ inputs.ksun_branch }}
           susfs_branch: ${{ steps.get-susfs-branch.outputs.susfs_branch }}
+          
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.model }}-kernel
+          path: ${{ matrix.model }}/artifacts/
+          if-no-files-found: error
 
   trigger-release:
     needs:
@@ -287,22 +304,24 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
 
       - name: Generate and Create New Tag
         run: |
-            BASE_TAG="v1.5.9-r0"
-            LATEST_TAG=$(gh api repos/$REPO_OWNER/$REPO_NAME/tags --jq '.[0].name')
-            if [ -z "$LATEST_TAG" ]; then
-              LATEST_TAG="$BASE_TAG"
-            else
-              LATEST_TAG=$(printf "%s\n%s\n" "$LATEST_TAG" "$BASE_TAG" | sort -rV | head -n1)
-            fi
-            NEW_TAG=$(echo "$LATEST_TAG" | awk -F'-r' '{suffix=$2; if (!suffix) suffix=0; suffix++; printf "%s-r%d", $1, suffix}')
-            echo "New tag: $NEW_TAG"
-            echo "NEW_TAG=${NEW_TAG}" >> $GITHUB_ENV
-            git tag $NEW_TAG
-            git push origin $NEW_TAG
+          BASE_TAG="v1.5.9-r0"
+          LATEST_TAG=$(gh api repos/$REPO_OWNER/$REPO_NAME/tags --jq '.[0].name')
+          if [ -z "$LATEST_TAG" ]; then
+            LATEST_TAG="$BASE_TAG"
+          else
+            LATEST_TAG=$(printf "%s\n%s\n" "$LATEST_TAG" "$BASE_TAG" | sort -rV | head -n1)
+          fi
+          NEW_TAG=$(echo "$LATEST_TAG" | awk -F'-r' '{suffix=$2; if (!suffix) suffix=0; suffix++; printf "%s-r%d", $1, suffix}')
+          echo "New tag: $NEW_TAG"
+          echo "NEW_TAG=${NEW_TAG}" >> $GITHUB_ENV
+          git tag $NEW_TAG
+          git push origin $NEW_TAG
 
       - name: Download Artifacts
         uses: actions/download-artifact@v4
@@ -328,16 +347,16 @@ jobs:
           |-------|----------------|
           EOF
           
-          # === Generate table rows ===
-          while IFS= read -r file; do
+          # Generate table rows
+          for file in $(find downloaded-artifacts -name "*.zip" -type f | sort); do
             if [ -f "$file" ]; then
-              model=$(basename "$file" .txt)
-              version=$(cat "$file")
-              printf "| %-7s | %-16s |\n" "$model" "$version" >> release_notes.md
+              model=$(basename "$(dirname "$file")" | sed 's/-kernel$//')
+              kernel_version=$(grep -oP 'android\d+-\d+\.\d+' "$file" || echo "${{ matrix.android_version }}-${{ matrix.kernel_version }}")
+              printf "| %-12s | %-16s |\n" "$model" "$kernel_version" >> release_notes.md
             fi
-          done < <(find downloaded-artifacts -name "*.txt" -type f | sort)
+          done
           
-          # === Add features and finalize ===
+          # Add features and finalize
           cat << 'EOF' >> release_notes.md
           
           ### Features
@@ -350,11 +369,11 @@ jobs:
           - [+] Ptrace message leak fix for kernels < 5.16
           - [+] Manual Hooks [scope_min_manual_hooks_v1.4]
           - [+] CONFIG_TMPFS_XATTR Support [Mountify Support]
-          - [+] BBR v1 Support.
-          - [+] HMBIRD scx support for OnePlus 13 & OnePlus Ace 5 Pro.
+          - [+] BBR v1 Support
+          - [+] HMBIRD scx support for OnePlus 13 & OnePlus Ace 5 Pro
           EOF
           
-          # === Output for debugging ===
+          # Output for debugging
           echo "--- Final Release Notes ---"
           cat release_notes.md
 
@@ -365,23 +384,12 @@ jobs:
             --title "${{ env.RELEASE_NAME }}" \
             --notes-file release_notes.md \
             --prerelease
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Release Assets Dynamically
         run: |
-          for file in ./downloaded-artifacts/kernel-*/*.zip; do
-              if [ -d "$file" ]; then
-                  continue
-              fi
+          for file in ./downloaded-artifacts/*/*.zip; do
+            if [ -f "$file" ]; then
               echo "Uploading $file..."
-              gh release upload ${{ env.NEW_TAG }} "$file"
+              gh release upload "${{ env.NEW_TAG }}" "$file" --clobber
+            fi
           done
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NEW_TAG: ${{ env.NEW_TAG }}
-
-      - name: Display Files Uploaded
-        run: |
-          echo "GitHub release created with the following files:"
-          ls ./downloaded-artifacts/**/*