Просмотр исходного кода

ci: simplify workflow by removing toolchain setup and matrix strategy

Remove unnecessary toolchain download and environment setup steps from build.yml
Simplify workflow by directly using input variables instead of matrix strategy in main.yml
James 1 год назад
Родитель
Сommit
44db2260de
2 измененных файлов с 18 добавлено и 81 удалено
  1. 0 25
      .github/workflows/build.yml
  2. 18 56
      .github/workflows/main.yml

+ 0 - 25
.github/workflows/build.yml

@@ -78,31 +78,6 @@ jobs:
           ccache --set-config=compression=true
           ccache --set-config=compression=true
           echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV
           echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV
 
 
-      - name: Download toolchain
-        run: |
-          AOSP_MIRROR=https://android.googlesource.com
-          BRANCH=main-kernel-build-2024
-          git clone $AOSP_MIRROR/kernel/prebuilts/build-tools -b $BRANCH --depth 1 kernel-build-tools
-          git clone $AOSP_MIRROR/platform/system/tools/mkbootimg -b $BRANCH --depth 1 mkbootimg
-
-      - name: Set environment variables
-        run: |
-          echo "AVBTOOL=$GITHUB_WORKSPACE/kernel-build-tools/linux-x86/bin/avbtool" >> $GITHUB_ENV
-          echo "MKBOOTIMG=$GITHUB_WORKSPACE/mkbootimg/mkbootimg.py" >> $GITHUB_ENV
-          echo "UNPACK_BOOTIMG=$GITHUB_WORKSPACE/mkbootimg/unpack_bootimg.py" >> $GITHUB_ENV
-
-      - name: Set boot sign key
-        env:
-          BOOT_SIGN_KEY: ${{ secrets.BOOT_SIGN_KEY }}
-        run: |
-          if [ ! -z "$BOOT_SIGN_KEY" ]; then
-            echo "$BOOT_SIGN_KEY" > ./kernel-build-tools/linux-x86/share/avb/testkey_rsa2048.pem
-            echo "BOOT_SIGN_KEY_PATH=$GITHUB_WORKSPACE/kernel-build-tools/linux-x86/share/avb/testkey_rsa2048.pem" >> $GITHUB_ENV
-          else
-            echo "BOOT_SIGN_KEY is not set. Using AOSP sign key..."
-            echo "BOOT_SIGN_KEY_PATH=$GITHUB_WORKSPACE/kernel-build-tools/linux-x86/share/avb/testkey_rsa2048.pem" >> $GITHUB_ENV
-          fi
-
       - name: Install Repo
       - name: Install Repo
         run: |
         run: |
           mkdir -p ./git-repo
           mkdir -p ./git-repo

+ 18 - 56
.github/workflows/main.yml

@@ -46,83 +46,45 @@ on:
         type: string
         type: string
         default: ""
         default: ""
 
 
-jobs:          
-  set-matrix:
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - id: set-matrix
-        run: |
-          case "${{ inputs.kernel_variant }}" in
-            "WKSU")
-              VARIANTS=("\"WILD\"")
-              ;;
-            "KSU")
-              VARIANTS=("\"KSU\"")
-              ;;
-            "NEXT")
-              VARIANTS=("\"NEXT\"")
-              ;;
-          esac
-
-          echo "matrix={\"kernelsu_variant\": [$(IFS=,; echo "${VARIANTS[*]}")]}" >> $GITHUB_OUTPUT
-
+jobs:
   build-kernels-a12:
   build-kernels-a12:
-    needs: set-matrix
     uses: ./.github/workflows/kernel-a12.yml
     uses: ./.github/workflows/kernel-a12.yml
     secrets: inherit
     secrets: inherit
-    strategy:
-      fail-fast: true
-      matrix: ${{ fromJson(needs.set-matrix.outputs.matrix) }}
     with:
     with:
-      kernelsu_variant: ${{ matrix.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
+      kernelsu_variant: ${{ github.event.inputs.kernel_variant == 'WKSU' && 'WILD' || github.event.inputs.kernel_variant == 'KSU' && 'KSU' || 'NEXT' }}
+      kernelsu_branch: ${{ github.event.inputs.kernelsu_branch }}
+      kernelsu_branch_other: ${{ github.event.inputs.kernelsu_branch_other }}
+      use_make: ${{ github.event.inputs.use_make }}
 
 
   build-kernels-a13:
   build-kernels-a13:
-    needs: set-matrix
     uses: ./.github/workflows/kernel-a13.yml
     uses: ./.github/workflows/kernel-a13.yml
     secrets: inherit
     secrets: inherit
-    strategy:
-      fail-fast: true
-      matrix: ${{ fromJson(needs.set-matrix.outputs.matrix) }}
     with:
     with:
-      kernelsu_variant: ${{ matrix.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
+      kernelsu_variant: ${{ github.event.inputs.kernel_variant == 'WKSU' && 'WILD' || github.event.inputs.kernel_variant == 'KSU' && 'KSU' || 'NEXT' }}
+      kernelsu_branch: ${{ github.event.inputs.kernelsu_branch }}
+      kernelsu_branch_other: ${{ github.event.inputs.kernelsu_branch_other }}
+      use_make: ${{ github.event.inputs.use_make }}
 
 
   build-kernels-a14:
   build-kernels-a14:
-    needs: set-matrix
     uses: ./.github/workflows/kernel-a14.yml
     uses: ./.github/workflows/kernel-a14.yml
     secrets: inherit
     secrets: inherit
-    strategy:
-      fail-fast: true
-      matrix: ${{ fromJson(needs.set-matrix.outputs.matrix) }}
     with:
     with:
-      kernelsu_variant: ${{ matrix.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
+      kernelsu_variant: ${{ github.event.inputs.kernel_variant == 'WKSU' && 'WILD' || github.event.inputs.kernel_variant == 'KSU' && 'KSU' || 'NEXT' }}
+      kernelsu_branch: ${{ github.event.inputs.kernelsu_branch }}
+      kernelsu_branch_other: ${{ github.event.inputs.kernelsu_branch_other }}
+      use_make: ${{ github.event.inputs.use_make }}
 
 
   build-kernels-a15:
   build-kernels-a15:
-    needs: set-matrix
     uses: ./.github/workflows/kernel-a15.yml
     uses: ./.github/workflows/kernel-a15.yml
     secrets: inherit
     secrets: inherit
-    strategy:
-      fail-fast: true
-      matrix: ${{ fromJson(needs.set-matrix.outputs.matrix) }}
     with:
     with:
-      kernelsu_variant: ${{ matrix.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
+      kernelsu_variant: ${{ github.event.inputs.kernel_variant == 'WKSU' && 'WILD' || github.event.inputs.kernel_variant == 'KSU' && 'KSU' || 'NEXT' }}
+      kernelsu_branch: ${{ github.event.inputs.kernelsu_branch }}
+      kernelsu_branch_other: ${{ github.event.inputs.kernelsu_branch_other }}
+      use_make: ${{ github.event.inputs.use_make }}
 
 
   release:
   release:
-    if: ${{ inputs.release_type == 'Release' || inputs.release_type == 'Pre-Release' }}
+    if: ${{ github.event.inputs.release_type == 'Release' || github.event.inputs.release_type == 'Pre-Release' }}
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     needs:
     needs:
       - build-kernels-a12
       - build-kernels-a12