diff --git a/.github/scripts/build_a12.sh b/.github/scripts/build_a12.sh index 17036947..83ed1b12 100644 --- a/.github/scripts/build_a12.sh +++ b/.github/scripts/build_a12.sh @@ -11,7 +11,15 @@ build_from_image() { echo "[+] patch level: $PATCH_LEVEL" echo '[+] Download prebuilt ramdisk' - curl -Lo gki-kernel.zip https://dl.google.com/android/gki/gki-certified-boot-android12-5.10-"${PATCH_LEVEL}"_r1.zip + GKI_URL=https://dl.google.com/android/gki/gki-certified-boot-android12-5.10-"${PATCH_LEVEL}"_r1.zip + FALLBACK_URL=https://dl.google.com/android/gki/gki-certified-boot-android12-5.10-2023-01_r1.zip + status=$(curl -sL -w "%{http_code}" "$GKI_URL" -o /dev/null) + if [ "$status" = "200" ]; then + curl -Lo gki-kernel.zip "$GKI_URL" + else + echo "[+] $GKI_URL not found, using $FALLBACK_URL" + curl -Lo gki-kernel.zip "$FALLBACK_URL" + fi unzip gki-kernel.zip && rm gki-kernel.zip echo '[+] Unpack prebuilt boot.img' diff --git a/.github/workflows/build-kernel-a12.yml b/.github/workflows/build-kernel-a12.yml index 3548d551..3fbf32e5 100644 --- a/.github/workflows/build-kernel-a12.yml +++ b/.github/workflows/build-kernel-a12.yml @@ -21,6 +21,14 @@ jobs: strategy: matrix: include: + - sub_level: 66 + os_patch_level: 2021-11 + - sub_level: 81 + os_patch_level: 2022-03 + - sub_level: 101 + os_patch_level: 2022-05 + - sub_level: 110 + os_patch_level: 2022-07 - sub_level: 136 os_patch_level: 2022-11 - sub_level: 149 diff --git a/.github/workflows/build-kernel-a13.yml b/.github/workflows/build-kernel-a13.yml index d52da8ea..2994d984 100644 --- a/.github/workflows/build-kernel-a13.yml +++ b/.github/workflows/build-kernel-a13.yml @@ -36,6 +36,9 @@ jobs: - version: "5.10" sub_level: 177 os_patch_level: 2023-06 + - version: "5.15" + sub_level: 41 + os_patch_level: 2022-11 - version: "5.15" sub_level: 74 os_patch_level: 2023-01 diff --git a/.github/workflows/gki-kernel.yml b/.github/workflows/gki-kernel.yml index 63005feb..6d5265fe 100644 --- a/.github/workflows/gki-kernel.yml +++ b/.github/workflows/gki-kernel.yml @@ -90,6 +90,12 @@ jobs: git clone https://gerrit.googlesource.com/git-repo mkdir android-kernel && cd android-kernel ../git-repo/repo init --depth=1 --u https://android.googlesource.com/kernel/manifest -b common-${{ inputs.tag }} + REMOTE_BRANCH=$(git ls-remote https://android.googlesource.com/kernel/common ${{ inputs.tag }}) + if grep -q deprecated <<< $REMOTE_BRANCH; then + echo "Found deprecated branch: ${{ inputs.tag }}" + sed -i 's/"${{ inputs.tag }}"/"deprecated\/${{ inputs.tag }}"/g' .repo/manifests/default.xml + cat .repo/manifests/default.xml + fi ../git-repo/repo sync -j$(nproc --all) - name: Setup KernelSU