Merge pull request WildKernels#26 from fatalcoder524/sm8750

Add OnePlus 13, OnePlus Ace 5 Pro and OnePlus Pad 2 Support and optimisations

Author: TheWildJames

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

@@ -1,9 +1,9 @@
 name: Build and Release OnePlus Kernels
 
 permissions:
-  contents: write  # Allow writing to repository contents (for pushing tags)
-  actions: write   # Allows triggering actions
-  
+  contents: write
+  actions: write
+
 on:
   workflow_dispatch:
     inputs:
@@ -12,148 +12,157 @@ on:
         required: true
         type: boolean
         default: true
+      ksun_branch:
+        description: "Choose KernelSU Next Branch"
+        required: true
+        type: choice
+        options:
+          - stable
+          - next
+          - next-susfs
+          - next-susfs-dev
+        default: stable
 
 jobs:
-  build-kernel-op11:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP11"
-      soc: "kalama"
-      branch: "oneplus/sm8550"
-      manifest: "oneplus_11_v.xml"
-      android_version: "android13"
-      kernel_version: "5.15"
-  build-kernel-op11r:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP11r"
-      soc: "waipio"
-      branch: "oneplus/sm8475"
-      manifest: "oneplus_11r_v.xml"
-      android_version: "android13"
-      kernel_version: "5.10"
-  build-kernel-op12:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP12"
-      soc: "pineapple"
-      branch: "oneplus/sm8650"
-      manifest: "oneplus12_v.xml"
-      android_version: "android14"
-      kernel_version: "6.1"
-  build-kernel-op13r:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP13r"
-      soc: "pineapple"
-      branch: "oneplus/sm8650"
-      manifest: "oneplus_13r.xml"
-      android_version: "android14"
-      kernel_version: "6.1"
-  build-kernel-opnord4:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP-NORD-4"
-      soc: "pineapple"
-      branch: "oneplus/sm7675"
-      manifest: "oneplus_nord_4_v.xml"
-      android_version: "android14"
-      kernel_version: "6.1"
-  build-kernel-opopen:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP-OPEN"
-      soc: "kalama"
-      branch: "oneplus/sm8550"
-      manifest: "oneplus_open_v.xml"
-      android_version: "android13"
-      kernel_version: "5.15"
-  build-kernel-opace2:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP-ACE-2"
-      soc: "waipio"
-      branch: "oneplus/sm8475"
-      manifest: "oneplus_ace2_v.xml"
-      android_version: "android13"
-      kernel_version: "5.10"
-  build-kernel-opace2pro:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP-ACE-2-PRO"
-      soc: "kalama"
-      branch: "oneplus/sm8550"
-      manifest: "oneplus_ace2pro_v.xml"
-      android_version: "android13"
-      kernel_version: "5.15"
-  build-kernel-opace5:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      model: "OP-ACE-5"
-      soc: "pineapple"
-      branch: "oneplus/sm8650"
-      manifest: "oneplus_ace5.xml"
-      android_version: "android14"
-      kernel_version: "6.1"
-  build-kernel-op10t:
+  build-batch-1: # Non Bazel Builds
+    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
+      matrix:
+        include:
+          - model: OP11
+            soc: kalama
+            branch: oneplus/sm8550
+            manifest: oneplus_11_v.xml
+            android_version: android13
+            kernel_version: "5.15"
+          - model: OP11r
+            soc: waipio
+            branch: oneplus/sm8475
+            manifest: oneplus_11r_v.xml
+            android_version: android13
+            kernel_version: "5.10"
+          - model: OP-OPEN
+            soc: kalama
+            branch: oneplus/sm8550
+            manifest: oneplus_open_v.xml
+            android_version: android13
+            kernel_version: "5.15"
+          - model: OP-ACE-2
+            soc: waipio
+            branch: oneplus/sm8475
+            manifest: oneplus_ace2_v.xml
+            android_version: android13
+            kernel_version: "5.10"
+          - model: OP10t
+            soc: waipio
+            branch: oneplus/sm8475
+            manifest: oneplus_10t_v.xml
+            android_version: android12
+            kernel_version: "5.10"
+          - model: OP10pro
+            soc: waipio
+            branch: oneplus/sm8450
+            manifest: oneplus_10_pro_v.xml
+            android_version: android12
+            kernel_version: "5.10"
+          - model: OP-ACE-2-PRO
+            soc: kalama
+            branch: oneplus/sm8550
+            manifest: oneplus_ace2pro_v.xml
+            android_version: android13
+            kernel_version: "5.15"
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
-      model: "OP10t"
-      soc: "waipio"
-      branch: "oneplus/sm8475"
-      manifest: "oneplus_10t_v.xml"
-      android_version: "android12"
-      kernel_version: "5.10"
-  build-kernel-op10pro:
+      model: ${{ matrix.model }}
+      soc: ${{ matrix.soc }}
+      branch: ${{ matrix.branch }}
+      manifest: ${{ matrix.manifest }}
+      android_version: ${{ matrix.android_version }}
+      kernel_version: ${{ matrix.kernel_version }}
+      ksun_branch: ${{ inputs.ksun_branch }}
+
+  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
+      matrix:
+        include:
+          - model: OP13
+            soc: sun
+            branch: oneplus/sm8750
+            manifest: oneplus_13.xml
+            android_version: android15
+            kernel_version: "6.6"
+          - model: OPAce5Pro
+            soc: sun
+            branch: oneplus/sm8750
+            manifest: oneplus_ace5_pro.xml
+            android_version: android15
+            kernel_version: "6.6"
+          - model: OP12
+            soc: pineapple
+            branch: oneplus/sm8650
+            manifest: oneplus12_v.xml
+            android_version: android14
+            kernel_version: "6.1"
+          - model: OP13r
+            soc: pineapple
+            branch: oneplus/sm8650
+            manifest: oneplus_13r.xml
+            android_version: android14
+            kernel_version: "6.1"
+          - model: OP-ACE-5
+            soc: pineapple
+            branch: oneplus/sm8650
+            manifest: oneplus_ace5.xml
+            android_version: android14
+            kernel_version: "6.1"
+          - model: OP-NORD-4
+            soc: pineapple
+            branch: oneplus/sm7675
+            manifest: oneplus_nord_4_v.xml
+            android_version: android14
+            kernel_version: "6.1"
+          - model: OP-PAD-2
+            soc: pineapple
+            branch: oneplus/sm8650
+            manifest: oneplus_pad2_v.xml
+            android_version: android14
+            kernel_version: "6.1"
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
-      model: "OP10pro"
-      soc: "waipio"
-      branch: "oneplus/sm8450"
-      manifest: "oneplus_10_pro_v.xml"
-      android_version: "android12"
-      kernel_version: "5.10"
+      model: ${{ matrix.model }}
+      soc: ${{ matrix.soc }}
+      branch: ${{ matrix.branch }}
+      manifest: ${{ matrix.manifest }}
+      android_version: ${{ matrix.android_version }}
+      kernel_version: ${{ matrix.kernel_version }}
+      ksun_branch: ${{ inputs.ksun_branch }}
 
   trigger-release:
-    runs-on: ubuntu-latest
     needs:
-        - build-kernel-op11
-        - build-kernel-op11r
-        - build-kernel-op12
-        - build-kernel-op13r
-        - build-kernel-opnord4
-        - build-kernel-opopen
-        - build-kernel-opace2
-        - build-kernel-opace2pro
-        - build-kernel-opace5
-        - build-kernel-op10t
-        - build-kernel-op10pro
+      - build-batch-1
+      - build-batch-2
+    runs-on: ubuntu-latest
     if: ${{ inputs.make_release }}
     env:
-      REPO_OWNER: TheWildJames
-      REPO_NAME: OnePlus_KernelSU_SUSFS
+      REPO_OWNER: ${{ github.repository_owner }}
+      REPO_NAME: ${{ github.event.repository.name }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      RELEASE_NAME: "*TEST BUILD* OnePlus Kernels With KernelSU Next & SUSFS v1.5.5 *TEST BUILD*"
+      RELEASE_NAME: "*TEST BUILD* OnePlus Kernels With KernelSU Next & SUSFS v1.5.7 *TEST BUILD*"
       RELEASE_NOTES: |
         This release contains KernelSU Next and SUSFS v1.5.7
         
         Module: 
         -> https://github.com/sidex15/ksu_module_susfs
-        
+
         Non-Official Managers:
         -> https://github.com/KernelSU-Next/KernelSU-Next
-        
+
         Features:
         [+] KernelSU-Next
         [+] SUSFS v1.5.7
@@ -163,67 +172,49 @@ jobs:
         [+] Magic Mount Support
 
     steps:
-      # Checkout the code
       - name: Checkout code
         uses: actions/checkout@v3
 
-      # Get the Latest Tag from GitHub
       - name: Generate and Create New Tag
         run: |
-            # Fetch the latest tag from GitHub (this is the latest tag based on the GitHub API)
             LATEST_TAG=$(gh api repos/$REPO_OWNER/$REPO_NAME/tags --jq '.[0].name')
             if [ -z "$LATEST_TAG" ]; then
-              LATEST_TAG="v1.5.7-r0"  # Default to v1.5.3-0 if no tag exists
+              LATEST_TAG="v1.5.7-r0"
             fi
-            
-            # Increment the suffix (e.g., v1.5.3-0 becomes v1.5.3-1)
             NEW_TAG=$(echo "$LATEST_TAG" | awk -F'-r' '{suffix=$2; if (!suffix) suffix=0; suffix++; printf "%s-r%d", $1, suffix}')
-            
-            # Output the new tag to be used
             echo "New tag: $NEW_TAG"
-            
-            # Set the new tag as an environment variable to be used in later steps
             echo "NEW_TAG=${NEW_TAG}" >> $GITHUB_ENV
-            
-            # Create the tag in the repository
             git tag $NEW_TAG
             git push origin $NEW_TAG
-            
-      # Download Artifacts for A12 (Only if A12 Build is successful or input is true or empty)
+
       - name: Download Artifacts
         uses: actions/download-artifact@v4
         with:
           path: ./downloaded-artifacts
 
-      # Create GitHub Release and upload files if make_release is true
       - name: Create GitHub Release
         uses: actions/create-release@v1
         with:
-          tag_name: ${{ env.NEW_TAG }}  # Use the generated tag for the release
-          prerelease: true  # Mark the release as a pre-release
-          release_name: ${{ env.RELEASE_NAME }}  # Pass the RELEASE_NAME to the action
-          body: ${{ env.RELEASE_NOTES }}  # Pass the RELEASE_NOTES to the action
+          tag_name: ${{ env.NEW_TAG }}
+          prerelease: true
+          release_name: ${{ env.RELEASE_NAME }}
+          body: ${{ env.RELEASE_NOTES }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Release Assets Dynamically
         run: |
-          # Loop through all files in the downloaded-artifacts directory
           for file in ./downloaded-artifacts/kernel-*/*; do
-              # Skip directories
               if [ -d "$file" ]; then
                   continue
               fi
-
-              # Upload the file to the GitHub release
               echo "Uploading $file..."
               gh release upload ${{ env.NEW_TAG }} "$file"
           done
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NEW_TAG: ${{ env.NEW_TAG }}
 
-      # Display Files Uploaded
       - name: Display Files Uploaded
         run: |
           echo "GitHub release created with the following files:"