From 849515fb0ef1dd8513eb92e535022d9394f762f0 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 4 Jul 2026 00:47:36 +0800 Subject: [PATCH] Fix: Add Alpine Linux (apk) support for Java 17 and Go installation --- .github/workflows/build-debug.yml | 11 +++++++++-- .github/workflows/build.yml | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index e291de2..c83eab3 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -58,7 +58,10 @@ jobs: - name: Install Java 17 run: | - if command -v apt-get &> /dev/null; then + if command -v apk &> /dev/null; then + apk add --no-cache openjdk17 + echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk" >> $GITHUB_ENV + elif command -v apt-get &> /dev/null; then apt-get update && apt-get install -y openjdk-17-jdk echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> $GITHUB_ENV else @@ -66,15 +69,19 @@ jobs: echo "JAVA_HOME=/toolcache/jdk-17.0.9+9" >> $GITHUB_ENV echo "/toolcache/jdk-17.0.9+9/bin" >> $GITHUB_PATH fi + java -version - name: Install Go 1.23 run: | - if command -v apt-get &> /dev/null; then + if command -v apk &> /dev/null; then + apk add --no-cache go + elif command -v apt-get &> /dev/null; then apt-get update && apt-get install -y golang-go else curl -sL https://go.dev/dl/go1.23.0.linux-amd64.tar.gz | tar xz -C /toolcache echo "/toolcache/go/bin" >> $GITHUB_PATH fi + go version - name: Setup Android SDK uses: android-actions/setup-android@v3 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1cceadc..dd1a61c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,10 @@ jobs: - name: Install Java 17 run: | - if command -v apt-get &> /dev/null; then + if command -v apk &> /dev/null; then + apk add --no-cache openjdk17 + echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk" >> $GITHUB_ENV + elif command -v apt-get &> /dev/null; then apt-get update && apt-get install -y openjdk-17-jdk echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> $GITHUB_ENV else @@ -100,15 +103,19 @@ jobs: echo "JAVA_HOME=/toolcache/jdk-17.0.9+9" >> $GITHUB_ENV echo "/toolcache/jdk-17.0.9+9/bin" >> $GITHUB_PATH fi + java -version - name: Install Go 1.23 run: | - if command -v apt-get &> /dev/null; then + if command -v apk &> /dev/null; then + apk add --no-cache go + elif command -v apt-get &> /dev/null; then apt-get update && apt-get install -y golang-go else curl -sL https://go.dev/dl/go1.23.0.linux-amd64.tar.gz | tar xz -C /toolcache echo "/toolcache/go/bin" >> $GITHUB_PATH fi + go version - name: Setup Android SDK uses: android-actions/setup-android@v3