Explorar o código

ci(build): simplify build workflow and improve artifact naming

- Split make commands into separate steps for better clarity
- Remove redundant image copying step when use_make is true
- Add build type (make/normal) to artifact names for better distinction
- Update conditional checks for boot image build scripts
TheWildJames hai 1 ano
pai
achega
c7890c5913
Modificáronse 1 ficheiros con 4 adicións e 15 borrados
  1. 4 15
      .github/workflows/build.yml

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

@@ -473,8 +473,7 @@ jobs:
             MAKE_ARGS="LLVM_IAS=1 $MAKE_ARGS"
             MAKE_ARGS="LLVM_IAS=1 $MAKE_ARGS"
           fi
           fi
           
           
-          make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin -fno-stack-protector" gki_defconfig Image Image.gz Image.lz4 || exit 1
-          
+          make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin -fno-stack-protector" gki_defconfig || exit 1
           make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin -fno-stack-protector" || exit 1
           make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin -fno-stack-protector" || exit 1
 
 
       - name: Create Kernel ZIP
       - name: Create Kernel ZIP
@@ -493,18 +492,8 @@ jobs:
           ZIP_NAME="WKSU-$KSUVER-${{ inputs.android_version }}-${{ inputs.kernel_version }}.$SUBLEVEL_FOR_NAME-${{ inputs.os_patch_level }}-AnyKernel3.zip"
           ZIP_NAME="WKSU-$KSUVER-${{ inputs.android_version }}-${{ inputs.kernel_version }}.$SUBLEVEL_FOR_NAME-${{ inputs.os_patch_level }}-AnyKernel3.zip"
           zip -r "../$ZIP_NAME" ./*
           zip -r "../$ZIP_NAME" ./*
 
 
-      - name: Create Bootimgs Folder and Copy Images
-        if: ${{ inputs.use_make == true }}
-        run: |
-          mkdir bootimgs
-
-          echo "Creating bootimgs folder and copying images..."
-          cp $CONFIG/common/out/arch/arm64/boot/Image ./bootimgs
-          cp $CONFIG/common/out/arch/arm64/boot/Image.gz ./bootimgs
-          cp $CONFIG/common/out/arch/arm64/boot/Image.lz4 ./bootimgs
-
       - name: Android 12 boot image build script
       - name: Android 12 boot image build script
-        if: ${{ inputs.android_version == 'android12' }}
+        if: ${{ inputs.android_version == 'android12' && inputs.use_make == false }}
         run: |
         run: |
           echo "Changing to configuration directory: $CONFIG..."
           echo "Changing to configuration directory: $CONFIG..."
           cd bootimgs
           cd bootimgs
@@ -557,7 +546,7 @@ jobs:
           cp ./boot-lz4.img ../WKSU-$KSUVER-${{ inputs.android_version }}-${{ inputs.kernel_version }}.$SUBLEVEL_FOR_NAME-${{ inputs.os_patch_level }}-boot-lz4.img
           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
       - name: Android 13/14/15 boot image build script
-        if: ${{ inputs.android_version == 'android13' || inputs.android_version == 'android14' || inputs.android_version == 'android15' }}
+        if: ${{ (inputs.android_version == 'android13' || inputs.android_version == 'android14' || inputs.android_version == 'android15') && inputs.use_make == false }}
         run: |
         run: |
           cd bootimgs
           cd bootimgs
 
 
@@ -593,7 +582,7 @@ jobs:
       - name: Upload Build Artifacts
       - name: Upload Build Artifacts
         uses: actions/upload-artifact@v4
         uses: actions/upload-artifact@v4
         with:
         with:
-          name: WKSU-${{ env.KSUVER }}-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ env.ACTUAL_SUBLEVEL || inputs.sub_level }}-${{ inputs.os_patch_level }}
+          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' }}
           path: |
           path: |
             *.zip
             *.zip
             *.img
             *.img