Merge branch 'main' of https://github.com/tiann/KernelSU

* 'main' of https://github.com/tiann/KernelSU: build(deps): bump gradle/actions from 3 to 4 in the actions group (tiann#1946) build(deps): bump the npm group across 1 directory with 17 updates (tiann#1937) build(deps): bump the crates group across 1 directory with 12 updates (tiann#1936) Update build-su.yml (tiann#1942) Upgrade ndk for CI (tiann#1941) ci: Fix ARCVM workflow to adapt to the change of kernel/Makefile (tiann#1906) build(deps): bump com.google.devtools.ksp from 2.0.0-1.0.23 to 2.0.0-1.0.24 in /manager in the maven group (tiann#1925) Signed-off-by: Edwiin Kusuma Jaya <[email protected]>
kutemeikito · Aug 9, 2024 · 5d8e2b8 · 5d8e2b8
2 parents 1a170fb + d5d6c10
commit 5d8e2b8
Show file tree

Hide file tree

Showing 8 changed files with 278 additions and 224 deletions.
diff --git a/.github/workflows/build-kernel-arcvm.yml b/.github/workflows/build-kernel-arcvm.yml
@@ -82,7 +82,7 @@ jobs:
           SUBLEVEL=$(grep -E '^SUBLEVEL = ' Makefile | awk '{print $3}')
           echo "ChromeOS ARCVM Linux kernel version: $VERSION.$PATCHLEVEL.$SUBLEVEL"
           echo "version=$VERSION.$PATCHLEVEL.$SUBLEVEL" >> $GITHUB_ENV
-          
+
       - name: Setup KernelSU
         working-directory: kernel
         run: |
@@ -94,7 +94,9 @@ jobs:
 
           echo "[+] Add KernelSU driver to Makefile"
           DRIVER_MAKEFILE=$KERNEL_ROOT/drivers/Makefile
-          grep -q "kernelsu" $DRIVER_MAKEFILE || echo "obj-y += kernelsu/" >> $DRIVER_MAKEFILE
+          DRIVER_KCONFIG=$KERNEL_ROOT/drivers/Kconfig
+          grep -q "kernelsu" "$DRIVER_MAKEFILE" || printf "\nobj-\$(CONFIG_KSU) += kernelsu/\n" >> "$DRIVER_MAKEFILE"
+          grep -q "kernelsu" "$DRIVER_KCONFIG" || sed -i "/endmenu/i\\source \"drivers/kernelsu/Kconfig\"" "$DRIVER_KCONFIG"
 
           echo "[+] Apply KernelSU patches"
           cd $KERNEL_ROOT && git apply $GITHUB_WORKSPACE/KernelSU/.github/patches/5.10/*.patch || echo "[-] No patch found"

diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml
@@ -85,9 +85,7 @@ jobs:
           java-version: 21
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3

diff --git a/.github/workflows/build-su.yml b/.github/workflows/build-su.yml
@@ -26,14 +26,11 @@ jobs:
         else
           echo "UPLOAD=false" >> $GITHUB_OUTPUT
         fi
-    - uses: nttld/setup-ndk@v1
-      with:
-        ndk-version: r26d
     - name: Build su
       working-directory: ./userspace/su
-      run: ndk-build
+      run: $ANDROID_NDK/ndk-build
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v4
       with:
         name: su
-        path: ./userspace/su/libs
+        path: ./userspace/su/libs
diff --git a/manager/gradle/libs.versions.toml b/manager/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.5.1"
 kotlin = "2.0.0"
-ksp = "2.0.0-1.0.23"
+ksp = "2.0.0-1.0.24"
 compose-bom = "2024.06.00"
 lifecycle = "2.8.4"
 accompanist = "0.34.0"

diff --git a/userspace/ksud/Cargo.lock b/userspace/ksud/Cargo.lock
diff --git a/userspace/ksud/Cargo.toml b/userspace/ksud/Cargo.toml
@@ -10,7 +10,7 @@ rust-version = "1.77.2"
 anyhow = "1"
 clap = { version = "4", features = ["derive"] }
 const_format = "0.2"
-zip = { version = "2.1.5", default-features = false }
+zip = { version = "2.1.6", default-features = false }
 zip-extensions = { version = "0.8.1", features = [
     "deflate",
     "deflate64",

diff --git a/website/package.json b/website/package.json
@@ -8,7 +8,7 @@
   "license": "MIT",
   "devDependencies": {
     "vitepress": "^1.3.1",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
   },
   "scripts": {
     "docs:dev": "vitepress dev docs",