From 9d266f282c4c8e5cc82d1ac1e5f4a9f68884e444 Mon Sep 17 00:00:00 2001
From: admin <admin@viaeon.com>
Date: Fri, 3 Jul 2026 19:07:16 +0800
Subject: [PATCH] Fix: Remove container, install JDK/Go directly via apt-get on
 ubuntu runner

---
 .github/workflows/build-debug.yml | 22 +++++-----------------
 .github/workflows/build.yml       | 23 +++++------------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml
index b83d2b7..cac0441 100644
--- a/.github/workflows/build-debug.yml
+++ b/.github/workflows/build-debug.yml
@@ -15,13 +15,13 @@ jobs:
   build-android-debug:
     name: Build Android Debug APK
     runs-on: ubuntu
-    container:
-      image: node:20-bullseye
-      options: --user root
 
     steps:
-      - name: Install Git LFS
-        run: apt-get update && apt-get install -y git-lfs
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -y openjdk-17-jdk git-lfs golang-go
+          echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> $GITHUB_ENV
 
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -34,18 +34,6 @@ jobs:
           git lfs install
           git lfs pull
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.23'
-
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b15231..d8872c8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,13 +49,13 @@ jobs:
     name: Build Android APK
     runs-on: ubuntu
     if: ${{ github.event.inputs.build_android != 'false' }}
-    container:
-      image: node:20-bullseye
-      options: --user root
 
     steps:
-      - name: Install Git LFS
-        run: apt-get update && apt-get install -y git-lfs
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -y openjdk-17-jdk git-lfs golang-go
+          echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> $GITHUB_ENV
 
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -68,19 +68,6 @@ jobs:
           git lfs install
           git lfs pull
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.23'
-          cache: true
-
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3