From 3be2afe7f0f3fdc2ee7cd53c4f25e67b8e02e243 Mon Sep 17 00:00:00 2001
From: Arnab Nandy <arnab_nandy7@yahoo.com>
Date: Thu, 2 Jul 2026 23:28:53 +0530
Subject: [PATCH 1/2] fix(ci): resolve cgroup v2 crash by replacing defunct
 run-buck action with JDK 11

The CI build was failing with a NullPointerException in CgroupV2Subsystem.getInstance() because the passy/run-buck GitHub Action uses an unmaintained Docker image (Ubuntu 18.04 + JDK 8) that is incompatible with cgroup v2 on the updated Ubuntu 24.04 runners.

Changes:

- Replace passy/run-buck@v0.1.0 Docker action with inline steps using thyrlian/android-sdk container and OpenJDK 11 (proper cgroup v2 support)

- Upgrade actions/checkout from v2 to v4 (fixes Node.js 20 deprecation warnings)

- Replace defunct jcenter.bintray.com Maven repo with Maven Central in .buckconfig
---
 .buckconfig                 |  2 +-
 .github/workflows/build.yml | 29 +++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.buckconfig b/.buckconfig
index 78a9b9b..fe16b4c 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -5,4 +5,4 @@
     target = android-26
     build_tools_version = 27.0.3
 [download]
-    maven_repo = https://jcenter.bintray.com/
+    maven_repo = https://repo1.maven.org/maven2/
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b23723..3ac37de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,11 +4,32 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: thyrlian/android-sdk:latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -yq curl openjdk-11-jre-headless python3 gcc
+          update-java-alternatives -s java-1.11.0-openjdk-amd64
+
+      - name: Install Buck
+        run: |
+          curl -L https://github.com/facebook/buck/releases/download/v2020.10.21.01/buck.2020.10.21.01_all.deb -o buck.deb
+          dpkg -i buck.deb
+          rm buck.deb
+
+      - name: Setup Android SDK
+        run: |
+          yes | sdkmanager --licenses > /dev/null 2>&1 || true
+          sdkmanager "build-tools;27.0.3" "platforms;android-26" > /dev/null
+
+      - name: Buck fetch
+        run: buck fetch //...
+
       - name: Buck build
-        uses: passy/run-buck@v0.1.0
-        with:
-          commands: '/opt/android-sdk-linux/tools/bin/sdkmanager "build-tools;27.0.3" "platforms;android-26" > /dev/null; buck fetch //...; buck build :soloader'
+        run: buck build :soloader
         env:
           ANDROID_HOME: ${{ env.ANDROID_SDK_ROOT }}

From 4bef81f5321f627a1e8bf35b6130626586a19ece Mon Sep 17 00:00:00 2001
From: Arnab Nandy <arnab_nandy7@yahoo.com>
Date: Sat, 4 Jul 2026 15:27:54 +0530
Subject: [PATCH 2/2] ci: add cgroup and toolchain smoke diagnostics

Signed-off-by: Arnab Nandy <arnab_nandy7@yahoo.com>
---
 .github/workflows/build.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3ac37de..6601812 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,6 +9,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Detect cgroup mode
+        run: |
+          if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
+            echo "Detected cgroup v2"
+          elif [ -d /sys/fs/cgroup/cpu ]; then
+            echo "Detected cgroup v1"
+          else
+            echo "::warning::Could not determine cgroup mode"
+          fi
+
       - name: Install dependencies
         run: |
           apt-get update
@@ -29,6 +39,12 @@ jobs:
       - name: Buck fetch
         run: buck fetch //...
 
+      - name: Verify toolchain smoke test
+        run: |
+          buck --version
+          sdkmanager --list_installed | grep -i "build-tools;27.0.3" || echo "::warning::build-tools not found in cache"
+          sdkmanager --list_installed | grep -i "platforms;android-26" || echo "::warning::platform not found in cache"
+
       - name: Buck build
         run: buck build :soloader
         env: