Add android14-6.1 (#1065)

This commit is contained in:
weishu
2023-10-22 17:55:02 +08:00
committed by GitHub
parent 927f2a26bd
commit 3f98493bb3
2 changed files with 15 additions and 5 deletions

View File

@@ -24,6 +24,9 @@ jobs:
- version: "5.15" - version: "5.15"
sub_level: 110 sub_level: 110
os_patch_level: 2023-09 os_patch_level: 2023-09
- version: "6.1"
sub_level: 25
os_patch_level: 2023-10
uses: ./.github/workflows/gki-kernel.yml uses: ./.github/workflows/gki-kernel.yml
secrets: inherit secrets: inherit
with: with:

View File

@@ -128,14 +128,13 @@ jobs:
DRIVER_MAKEFILE=$GKI_ROOT/common/drivers/Makefile DRIVER_MAKEFILE=$GKI_ROOT/common/drivers/Makefile
grep -q "kernelsu" $DRIVER_MAKEFILE || echo "obj-y += kernelsu/" >> $DRIVER_MAKEFILE grep -q "kernelsu" $DRIVER_MAKEFILE || echo "obj-y += kernelsu/" >> $DRIVER_MAKEFILE
echo "[+] Apply KernelSU patches" echo "[+] Apply KernelSU patches"
cd $GKI_ROOT/common/ && git apply $GITHUB_WORKSPACE/KernelSU/.github/patches/$PATCH_PATH/*.patch cd $GKI_ROOT/common/ && git apply $GITHUB_WORKSPACE/KernelSU/.github/patches/$PATCH_PATH/*.patch || echo "[-] No patch found"
echo "[+] Patch script/setlocalversion"
sed -i 's/-dirty//g' $GKI_ROOT/common/scripts/setlocalversion
if [ "$IS_DEBUG_KERNEL" = "true" ]; then if [ "$IS_DEBUG_KERNEL" = "true" ]; then
echo "[+] Enable debug features for kernel" echo "[+] Enable debug features for kernel"
echo "ccflags-y += -DCONFIG_KSU_DEBUG" >> $GITHUB_WORKSPACE/KernelSU/kernel/Makefile echo "ccflags-y += -DCONFIG_KSU_DEBUG" >> $GITHUB_WORKSPACE/KernelSU/kernel/Makefile
fi fi
repo status
echo "[+] KernelSU setup done." echo "[+] KernelSU setup done."
- name: Symbol magic - name: Symbol magic
@@ -157,6 +156,14 @@ jobs:
max-size: 2G max-size: 2G
save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
- name: Make working directory clean to avoid dirty
working-directory: android-kernel
run: |
git config --global user.email "bot@kernelsu.org"
git config --global user.name "KernelSUBot"
cd common/ && git add -A && git commit -a -m "Add KernelSU"
repo status
- name: Build boot.img - name: Build boot.img
working-directory: android-kernel working-directory: android-kernel
run: | run: |
@@ -167,7 +174,7 @@ jobs:
if [ -e build/build.sh ]; then if [ -e build/build.sh ]; then
CCACHE="/usr/bin/ccache" LTO=thin BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh CCACHE="/usr/bin/ccache" LTO=thin BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh
else else
tools/bazel run --lto=thin //common:kernel_aarch64_dist -- --dist_dir=dist tools/bazel run --disk_cache=/home/runner/.cache/bazel --config=fast --config=stamp --lto=thin //common:kernel_aarch64_dist -- --dist_dir=dist
fi fi
- name: Prepare artifacts - name: Prepare artifacts