Merge branch 'main' into drop_nongki

tiann · May 26, 2024 · c8f1db8 · c8f1db8
2 parents 492e593 + 6a39798
commit c8f1db8
Show file tree

Hide file tree

Showing 83 changed files with 1,114 additions and 700 deletions.
diff --git a/.github/workflows/build-debug-kernel.yml b/.github/workflows/build-debug-kernel.yml
@@ -7,25 +7,42 @@ jobs:
     uses: ./.github/workflows/gki-kernel.yml
     with:
       version: android12-5.10
-      version_name: android12-5.10.185
-      tag: android12-5.10-2023-09
-      os_patch_level: 2023-09
+      version_name: android12-5.10.209
+      tag: android12-5.10-2024-05
+      os_patch_level: 2024-05
       patch_path: "5.10"
       debug: true
   build-debug-kernel-a13:
     strategy:
       matrix:
         include:
           - version: "5.10"
-            sub_level: 187
-            os_patch_level: 2023-08
+            sub_level: 209
+            os_patch_level: 2024-05
           - version: "5.15"
-            sub_level: 119
-            os_patch_level: 2023-09
+            sub_level: 148
+            os_patch_level: 2024-05
     uses: ./.github/workflows/gki-kernel.yml
     with:
       version: android13-${{ matrix.version }}
       version_name: android13-${{ matrix.version }}.${{ matrix.sub_level }}
       tag: android13-${{ matrix.version }}-${{ matrix.os_patch_level }}
       patch_path: ${{ matrix.version }}
       debug: true
+  build-debug-kernel-a14:
+    strategy:
+      matrix:
+        include:
+          - version: "5.15"
+            sub_level: 148
+            os_patch_level: 2024-05
+          - version: "6.1"
+            sub_level: 75
+            os_patch_level: 2024-05
+    uses: ./.github/workflows/gki-kernel.yml
+    with:
+      version: android14-${{ matrix.version }}
+      version_name: android14-${{ matrix.version }}.${{ matrix.sub_level }}
+      tag: android14-${{ matrix.version }}-${{ matrix.os_patch_level }}
+      patch_path: ${{ matrix.version }}
+      debug: true
diff --git a/.github/workflows/build-kernel-a12.yml b/.github/workflows/build-kernel-a12.yml
@@ -21,16 +21,12 @@ jobs:
     strategy:
       matrix:
         include:
-          - sub_level: 168
-            os_patch_level: 2023-05
-          - sub_level: 177
-            os_patch_level: 2023-07
-          - sub_level: 185
-            os_patch_level: 2023-09
           - sub_level: 198
             os_patch_level: 2024-01
           - sub_level: 205
             os_patch_level: 2024-03
+          - sub_level: 209
+            os_patch_level: 2024-05
     uses: ./.github/workflows/gki-kernel.yml
     secrets: inherit
     with:
@@ -71,7 +67,7 @@ jobs:
           git clone $AOSP_MIRROR/platform/prebuilts/build-tools -b $BRANCH --depth 1 build-tools
           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
-          pip3 install telethon==1.34.0
+          pip3 install telethon
 
       - name: Set boot sign key
         env:
@@ -116,7 +112,7 @@ jobs:
     uses: ./.github/workflows/gki-kernel.yml
     with:
       version: android12-5.10
-      version_name: android12-5.10.205
-      tag: android12-5.10-2024-03
-      os_patch_level: 2024-03
+      version_name: android12-5.10.209
+      tag: android12-5.10-2024-05
+      os_patch_level: 2024-05
       patch_path: "5.10"
diff --git a/.github/workflows/build-kernel-a13.yml b/.github/workflows/build-kernel-a13.yml
@@ -21,57 +21,30 @@ jobs:
     strategy:
       matrix:
         include:
-          - version: "5.10"
-            sub_level: 168
-            os_patch_level: 2023-05
-          - version: "5.10"
-            sub_level: 177
-            os_patch_level: 2023-07
-          - version: "5.10"
-            sub_level: 177
-            os_patch_level: 2024-02
-          - version: "5.10"
-            sub_level: 186
-            os_patch_level: 2023-08
-          - version: "5.10"
-            sub_level: 186
-            os_patch_level: 2023-09
           - version: "5.10"
             sub_level: 189
             os_patch_level: 2023-11
           - version: "5.10"
             sub_level: 198
-            os_patch_level: 2023-12
-          - version: "5.10"
-            sub_level: 205
-            os_patch_level: 2024-02
+            os_patch_level: 2024-01
           - version: "5.10"
             sub_level: 205
             os_patch_level: 2024-03
           - version: "5.10"
             sub_level: 209
-            os_patch_level: 2024-04
-          - version: "5.15"
-            sub_level: 94
-            os_patch_level: 2023-05
-          - version: "5.15"
-            sub_level: 104
-            os_patch_level: 2023-07
-          - version: "5.15"
-            sub_level: 119
-            os_patch_level: 2023-09
+            os_patch_level: 2024-05
           - version: "5.15"
             sub_level: 123
             os_patch_level: 2023-11
           - version: "5.15"
             sub_level: 137
-            os_patch_level: 2023-12
+            os_patch_level: 2024-01
           - version: "5.15"
             sub_level: 144
             os_patch_level: 2024-03
           - version: "5.15"
             sub_level: 148
-            os_patch_level: 2024-04
+            os_patch_level: 2024-05
     uses: ./.github/workflows/gki-kernel.yml
     secrets: inherit
     with:
@@ -112,7 +85,7 @@ jobs:
           git clone $AOSP_MIRROR/platform/prebuilts/build-tools -b $BRANCH --depth 1 build-tools
           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
-          pip3 install telethon==1.34.0
+          pip3 install telethon
 
       - name: Set boot sign key
         env:
@@ -158,15 +131,15 @@ jobs:
       matrix:
         include:
           - version: "5.10"
-            sub_level: 189
-            os_patch_level: 2023-10
+            sub_level: 209
+            os_patch_level: 2024-05
           - version: "5.15"
-            sub_level: 123
-            os_patch_level: 2023-10
+            sub_level: 148
+            os_patch_level: 2024-05
     uses: ./.github/workflows/gki-kernel.yml
     with:
       version: android13-${{ matrix.version }}
       version_name: android13-${{ matrix.version }}.${{ matrix.sub_level }}
       tag: android13-${{ matrix.version }}-${{ matrix.os_patch_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      patch_path: ${{ matrix.version }}
+      patch_path: ${{ matrix.version }}
diff --git a/.github/workflows/build-kernel-a14.yml b/.github/workflows/build-kernel-a14.yml
@@ -21,9 +21,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - version: "5.15"
-            sub_level: 110
-            os_patch_level: 2023-09
           - version: "5.15"
             sub_level: 131
             os_patch_level: 2023-11
@@ -35,7 +32,7 @@ jobs:
             os_patch_level: 2024-03
           - version: "5.15"
             sub_level: 148
-            os_patch_level: 2024-04
+            os_patch_level: 2024-05
           - version: "6.1"
             sub_level: 25
             os_patch_level: 2023-10
@@ -50,7 +47,7 @@ jobs:
             os_patch_level: 2024-03
           - version: "6.1"
             sub_level: 75
-            os_patch_level: 2024-04
+            os_patch_level: 2024-05
     uses: ./.github/workflows/gki-kernel.yml
     secrets: inherit
     with:
@@ -91,7 +88,7 @@ jobs:
           git clone $AOSP_MIRROR/platform/prebuilts/build-tools -b $BRANCH --depth 1 build-tools
           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
-          pip3 install telethon==1.34.0
+          pip3 install telethon
 
       - name: Set boot sign key
         env:
@@ -137,11 +134,11 @@ jobs:
       matrix:
         include:
           - version: "5.15"
-            sub_level: 110
-            os_patch_level: 2023-09
+            sub_level: 148
+            os_patch_level: 2024-05
           - version: "6.1"
             sub_level: 75
-            os_patch_level: 2024-04
+            os_patch_level: 2024-05
     uses: ./.github/workflows/gki-kernel.yml
     with:
       version: android14-${{ matrix.version }}

diff --git a/.github/workflows/build-lkm.yml b/.github/workflows/build-lkm.yml
@@ -15,20 +15,20 @@ jobs:
       matrix:
         include:
           - version: "android12-5.10"
-            sub_level: 198
-            os_patch_level: "2024-01"
+            sub_level: 209
+            os_patch_level: 2024-05
           - version: "android13-5.10"
-            sub_level: 198
-            os_patch_level: 2023-12
+            sub_level: 209
+            os_patch_level: 2024-05
           - version: "android13-5.15"
-            sub_level: 137
-            os_patch_level: 2023-12
+            sub_level: 148
+            os_patch_level: 2024-05
           - version: "android14-5.15"
-            sub_level: 110
-            os_patch_level: 2023-09
+            sub_level: 148
+            os_patch_level: 2024-05
           - version: "android14-6.1"
-            sub_level: 43
-            os_patch_level: 2023-11
+            sub_level: 75
+            os_patch_level: 2024-05
     uses: ./.github/workflows/gki-kernel.yml
     with:
       version: ${{ matrix.version }}

diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml
@@ -155,6 +155,6 @@ jobs:
           if [ ! -z "${{ secrets.BOT_TOKEN }}" ]; then
             export VERSION=$(git rev-list --count HEAD)
             APK=$(find ./app/build/outputs/apk/release -name "*.apk")
-            pip3 install telethon==1.34.0
+            pip3 install telethon
             python3 $GITHUB_WORKSPACE/scripts/ksubot.py $APK
           fi