Browse Source

ci: remove use_make input and refactor build workflow

The use_make input was removed from all kernel workflows as it's now handled via matrix strategy in build.yml. This simplifies the workflow configuration and makes the build process more consistent across different kernel versions.
TheWildJames 1 year ago
parent
commit
8e04d8ca15

+ 1 - 4
.github/workflows/build-check.yml

@@ -49,8 +49,6 @@ jobs:
             kernel_version: "6.6"
             sub_level: "X"
             os_patch_level: "lts"
-        
-        use_make: [true, false]
 
     name: Build Check
     uses: ./.github/workflows/build.yml
@@ -59,5 +57,4 @@ jobs:
       android_version: ${{ matrix.kernel_config.android_version }}
       kernel_version: ${{ matrix.kernel_config.kernel_version }}
       sub_level: ${{ matrix.kernel_config.sub_level }}
-      os_patch_level: ${{ matrix.kernel_config.os_patch_level }}
-      use_make: ${{ matrix.use_make }}
+      os_patch_level: ${{ matrix.kernel_config.os_patch_level }}

+ 15 - 13
.github/workflows/build.yml

@@ -21,14 +21,14 @@ on:
       revision:
         required: false
         type: string
-      use_make:
-        required: true
-        type: boolean
 
 jobs:
   build-gki:
     runs-on: ubuntu-latest
     timeout-minutes: 120
+    strategy:
+      matrix:
+        use_make: [true, false]
 
     steps:
       # # - name: Maximize Build Space
@@ -172,7 +172,8 @@ jobs:
           
           # Apply KSU integration patches
           cd ./Wild_KSU
-          cp ../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
+          #cp ../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch .
+          cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/10_enable_susfs_for_ksu.patch ./
           patch -p1 --forward < 10_enable_susfs_for_ksu.patch || true
           
           # Apply compatibility fixes
@@ -342,7 +343,7 @@ jobs:
           perl -pi -e 's/^\s*"protected_exports_list"\s*:\s*"android\/abi_gki_protected_exports_aarch64",\s*$//;' ./common/BUILD.bazel
 
       - name: Build
-        if: ${{ inputs.use_make == false }}
+        if: ${{ matrix.use_make == false }}
         run : |
           set -e
           set -x
@@ -355,7 +356,7 @@ jobs:
           fi
 
       - name: Create Bootimgs Folder and Copy Images for Android 12/13
-        if: ${{ (inputs.android_version == 'android12' || inputs.android_version == 'android13') && inputs.use_make == false }}
+        if: ${{ (inputs.android_version == 'android12' || inputs.android_version == 'android13') && matrix.use_make == false }}
         run: |
           mkdir bootimgs
 
@@ -369,7 +370,7 @@ jobs:
           gzip -n -k -f -9 ./Image > ./Image.gz
 
       - name: Create Bootimgs Folder and Copy Images for Android 14/15
-        if: ${{ (inputs.android_version == 'android14' || inputs.android_version == 'android15') && inputs.use_make == false }}
+        if: ${{ (inputs.android_version == 'android14' || inputs.android_version == 'android15') && matrix.use_make == false }}
         run: |
           mkdir bootimgs
 
@@ -383,7 +384,7 @@ jobs:
           gzip -n -k -f -9 ./Image > ./Image.gz
 
       - name: Detect Clang Version from Configs
-        if: ${{ inputs.use_make == true }}
+        if: ${{ matrix.use_make == true }}
         run: |
           KERNEL_PATH="$GITHUB_WORKSPACE/$CONFIG"
           DEFCONFIG="$KERNEL_PATH/common/arch/arm64/configs/gki_defconfig"
@@ -424,7 +425,7 @@ jobs:
 
 
       - name: Build Kernel
-        if: ${{ inputs.use_make == true }}
+        if: ${{ matrix.use_make == true }}
         run: |
           KERNEL_PATH="$GITHUB_WORKSPACE/$CONFIG"
           CLANG_BIN_PATH="${{ env.CLANG_BIN_PATH }}"
@@ -477,7 +478,7 @@ jobs:
           make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin -fno-stack-protector" || exit 1
 
       - name: Create Kernel ZIP
-        if: ${{ inputs.use_make == true }}
+        if: ${{ matrix.use_make == true }}
         run: |
           cp $CONFIG/common/out/arch/arm64/boot/Image AnyKernel3/Image
 
@@ -493,7 +494,7 @@ jobs:
           zip -r "../$ZIP_NAME" ./*
 
       - name: Android 12 boot image build script
-        if: ${{ inputs.android_version == 'android12' && inputs.use_make == false }}
+        if: ${{ inputs.android_version == 'android12' && matrix.use_make == false }}
         run: |
           echo "Changing to configuration directory: $CONFIG..."
           cd bootimgs
@@ -546,7 +547,7 @@ jobs:
           cp ./boot-lz4.img ../WKSU-$KSUVER-${{ inputs.android_version }}-${{ inputs.kernel_version }}.$SUBLEVEL_FOR_NAME-${{ inputs.os_patch_level }}-boot-lz4.img
 
       - name: Android 13/14/15 boot image build script
-        if: ${{ (inputs.android_version == 'android13' || inputs.android_version == 'android14' || inputs.android_version == 'android15') && inputs.use_make == false }}
+        if: ${{ (inputs.android_version == 'android13' || inputs.android_version == 'android14' || inputs.android_version == 'android15') && matrix.use_make == false }}
         run: |
           cd bootimgs
 
@@ -580,9 +581,10 @@ jobs:
           fi
           
       - name: Upload Build Artifacts
+        if: ${{ matrix.use_make == true }}
         uses: actions/upload-artifact@v4
         with:
-          name: WKSU-${{ env.KSUVER }}-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ env.ACTUAL_SUBLEVEL || inputs.sub_level }}-${{ inputs.os_patch_level }}-${{ inputs.use_make && 'make' || 'normal' }}
+          name: WKSU-${{ env.KSUVER }}-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ env.ACTUAL_SUBLEVEL || inputs.sub_level }}-${{ inputs.os_patch_level }}-${{ matrix.use_make && 'make' || 'bazel' }}
           path: |
             *.zip
             *.img

+ 0 - 5
.github/workflows/kernel-a12-5-10.yml

@@ -6,10 +6,6 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      use_make:
-        required: true
-        type: boolean
 
 jobs:
   build-kernels-a12:
@@ -55,5 +51,4 @@ jobs:
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
       revision: ${{ matrix.revision }}
-      use_make: ${{ inputs.use_make }}
 

+ 1 - 6
.github/workflows/kernel-a13-5-10.yml

@@ -6,10 +6,6 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      use_make:
-        required: true
-        type: boolean
 
 jobs:
   build-kernels-a13-5-10:
@@ -47,5 +43,4 @@ jobs:
       android_version: "android13"
       kernel_version: "5.10"
       sub_level: ${{ matrix.sub_level }}
-      os_patch_level: ${{ matrix.os_patch_level }}
-      use_make: ${{ inputs.use_make }}
+      os_patch_level: ${{ matrix.os_patch_level }}

+ 1 - 6
.github/workflows/kernel-a13-5-15.yml

@@ -6,10 +6,6 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      use_make:
-        required: true
-        type: boolean
 
 jobs:
   build-kernels-a13-5-15:
@@ -49,5 +45,4 @@ jobs:
       android_version: "android13"
       kernel_version: "5.15"
       sub_level: ${{ matrix.sub_level }}
-      os_patch_level: ${{ matrix.os_patch_level }}
-      use_make: ${{ inputs.use_make }}
+      os_patch_level: ${{ matrix.os_patch_level }}

+ 1 - 6
.github/workflows/kernel-a14-5-15.yml

@@ -6,10 +6,6 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      use_make:
-        required: true
-        type: boolean
 
 jobs:
   build-kernels-a14-5-15:
@@ -47,5 +43,4 @@ jobs:
       android_version: "android14"
       kernel_version: "5.15"
       sub_level: ${{ matrix.sub_level }}
-      os_patch_level: ${{ matrix.os_patch_level }}
-      use_make: ${{ inputs.use_make }}
+      os_patch_level: ${{ matrix.os_patch_level }}

+ 1 - 6
.github/workflows/kernel-a14-6-1.yml

@@ -6,10 +6,6 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      use_make:
-        required: true
-        type: boolean
 
 jobs:
   build-kernels-a14-6-1:
@@ -65,5 +61,4 @@ jobs:
       android_version: "android14"
       kernel_version: "6.1"
       sub_level: ${{ matrix.sub_level }}
-      os_patch_level: ${{ matrix.os_patch_level }}
-      use_make: ${{ inputs.use_make }}
+      os_patch_level: ${{ matrix.os_patch_level }}

+ 0 - 5
.github/workflows/kernel-a15-6-6.yml

@@ -6,10 +6,6 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      use_make:
-        required: true
-        type: boolean
 
 jobs:
   build-kernels-a15:
@@ -52,4 +48,3 @@ jobs:
       kernel_version: "6.6"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      use_make: ${{ inputs.use_make }}

+ 0 - 17
.github/workflows/main.yml

@@ -7,11 +7,6 @@ permissions:
 on:
   workflow_dispatch:
     inputs:
-      use_make:
-        description: 'Build with MAKE?'
-        required: true
-        type: boolean
-        default: true
       release_type:
         description: "Choose Release Type"
         required: true
@@ -25,38 +20,26 @@ jobs:
   build-a12-5-10:
     uses: ./.github/workflows/kernel-a12-5-10.yml
     secrets: inherit
-    with:
-      use_make: ${{ inputs.use_make }}
 
   build-a13-5-10:
     uses: ./.github/workflows/kernel-a13-5-10.yml
     secrets: inherit
-    with:
-      use_make: ${{ inputs.use_make }}
 
   build-a13-5-15:
     uses: ./.github/workflows/kernel-a13-5-15.yml
     secrets: inherit
-    with:
-      use_make: ${{ inputs.use_make }}
 
   build-a14-5-15:
     uses: ./.github/workflows/kernel-a14-5-15.yml
     secrets: inherit
-    with:
-      use_make: ${{ inputs.use_make }}
 
   build-a14-6-1:
     uses: ./.github/workflows/kernel-a14-6-1.yml
     secrets: inherit
-    with:
-      use_make: ${{ inputs.use_make }}
 
   build-a15-6-6:
     uses: ./.github/workflows/kernel-a15-6-6.yml
     secrets: inherit
-    with:
-      use_make: ${{ inputs.use_make }}
 
   release:
     runs-on: ubuntu-latest