From 2a88cca50c25858685254db13cfb8004999f0811 Mon Sep 17 00:00:00 2001 From: Ylarod Date: Tue, 31 Jan 2023 10:37:54 +0800 Subject: [PATCH] ci: update kernel build, remove embed ksud (#159) --- .github/workflows/build-kernel-a12.yml | 6 ------ .github/workflows/build-kernel-a13.yml | 9 +++------ .github/workflows/gki-kernel.yml | 20 ++++++++++---------- .github/workflows/ksud.yml | 9 --------- 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build-kernel-a12.yml b/.github/workflows/build-kernel-a12.yml index 5fd3282d..2e8a7c1a 100644 --- a/.github/workflows/build-kernel-a12.yml +++ b/.github/workflows/build-kernel-a12.yml @@ -17,12 +17,7 @@ on: - "kernel/**" - "userspace/ksud/**" jobs: - build-ksud: - uses: ./.github/workflows/ksud.yml - with: - target: aarch64-linux-android build-kernel: - needs: build-ksud if: github.event_name != 'pull_request' strategy: matrix: @@ -104,7 +99,6 @@ jobs: bash $GITHUB_WORKSPACE/KernelSU/.github/scripts/build_a12.sh check-build-kernel: - needs: build-ksud if: github.event_name == 'pull_request' uses: ./.github/workflows/gki-kernel.yml with: diff --git a/.github/workflows/build-kernel-a13.yml b/.github/workflows/build-kernel-a13.yml index 2bb7fb58..5fe35d79 100644 --- a/.github/workflows/build-kernel-a13.yml +++ b/.github/workflows/build-kernel-a13.yml @@ -17,12 +17,7 @@ on: - "kernel/**" - "userspace/ksud/**" jobs: - build-ksud: - uses: ./.github/workflows/ksud.yml - with: - target: aarch64-linux-android build-kernel: - needs: build-ksud if: github.event_name != 'pull_request' strategy: matrix: @@ -102,7 +97,6 @@ jobs: bash $GITHUB_WORKSPACE/KernelSU/.github/scripts/build_a13.sh check-build-kernel: - needs: build-ksud if: github.event_name == 'pull_request' strategy: matrix: @@ -110,6 +104,9 @@ jobs: - version: "5.10" sub_level: 107 os_patch_level: 2022-11 + - version: "5.10" + sub_level: 149 + os_patch_level: 2023-01 - version: "5.15" sub_level: 41 os_patch_level: 2022-11 diff --git a/.github/workflows/gki-kernel.yml b/.github/workflows/gki-kernel.yml index 5f531459..ec06220d 100644 --- a/.github/workflows/gki-kernel.yml +++ b/.github/workflows/gki-kernel.yml @@ -96,12 +96,6 @@ jobs: ../git-repo/repo init --depth=1 --u https://android.googlesource.com/kernel/manifest -b common-${{ inputs.tag }} ../git-repo/repo sync -j$(nproc --all) - - name: Download prebuilt ksud from artifacts - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.embed_ksud }} - path: . - - name: Setup KernelSU env: PATCH_PATH: ${{ inputs.patch_path }} @@ -117,9 +111,6 @@ jobs: grep -q "kernelsu" $DRIVER_MAKEFILE || echo "obj-y += kernelsu/" >> $DRIVER_MAKEFILE echo "[+] Apply KernelSU patches" cd $GKI_ROOT/common/ && git apply $GITHUB_WORKSPACE/KernelSU/.github/patches/$PATCH_PATH/*.patch - cd $GITHUB_WORKSPACE - echo "[+] Build embed_ksud.c" - python3 ./KernelSU/scripts/bin2c.py ./aarch64-linux-android/release/ksud ksud > ./KernelSU/kernel/embed_ksud.c echo "[+] KernelSU setup done." - name: Symbol magic @@ -144,9 +135,18 @@ jobs: mkdir output cp $OUTDIR/Image ./output/ cp $OUTDIR/Image.lz4 ./output/ + git clone https://github.com/Kernel-SU/AnyKernel3 + rm -rf ./AnyKernel3/.git + cp $OUTDIR/Image ./AnyKernel3/ - name: Upload Image and Image.gz uses: actions/upload-artifact@v3 with: name: Image-${{ inputs.version_name }}_${{ inputs.os_patch_level }} - path: ./output/* \ No newline at end of file + path: ./output/* + + - name: Upload AnyKernel3 + uses: actions/upload-artifact@v3 + with: + name: AnyKernel3-${{ inputs.version_name }}_${{ inputs.os_patch_level }} + path: ./AnyKernel3/* \ No newline at end of file diff --git a/.github/workflows/ksud.yml b/.github/workflows/ksud.yml index fc70791c..49aaa7cc 100644 --- a/.github/workflows/ksud.yml +++ b/.github/workflows/ksud.yml @@ -28,15 +28,6 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo- - - name: Set up ksud build cache - if: inputs.use_cache == true - uses: actions/cache@v3 - continue-on-error: false - with: - path: ./userspace/ksud/target/ - key: ${{ runner.os }}-ksud-${{ hashFiles('**/Cargo.lock') }}-${{ inputs.target }} - restore-keys: ${{ runner.os }}-ksud- - - name: Build ksud uses: actions-rs/cargo@v1 with: