From 396ba6bc9771c3507ef964fbb38f114126b6b003 Mon Sep 17 00:00:00 2001
From: funman300 <funman300@gmail.com>
Date: Thu, 14 May 2026 10:11:39 -0700
Subject: [PATCH] fix(ci): always install Java regardless of SDK cache hit;
 harden release creation

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .gitea/workflows/android-build.yml   |  4 +++-
 .gitea/workflows/android-release.yml | 22 ++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/android-build.yml b/.gitea/workflows/android-build.yml
index 6c39e2b..8583c7b 100644
--- a/.gitea/workflows/android-build.yml
+++ b/.gitea/workflows/android-build.yml
@@ -37,10 +37,12 @@ jobs:
           path: ${{ env.ANDROID_SDK_ROOT }}
           key: android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
 
+      - name: Install system dependencies
+        run: sudo apt-get install -y openjdk-17-jdk-headless unzip
+
       - name: Install Android SDK + NDK
         if: steps.sdk-cache.outputs.cache-hit != 'true'
         run: |
-          sudo apt-get install -y openjdk-17-jdk-headless unzip
           mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
           curl -sL \
             "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
diff --git a/.gitea/workflows/android-release.yml b/.gitea/workflows/android-release.yml
index 293fbd6..434e99a 100644
--- a/.gitea/workflows/android-release.yml
+++ b/.gitea/workflows/android-release.yml
@@ -34,10 +34,13 @@ jobs:
           path: ${{ env.ANDROID_SDK_ROOT }}
           key: android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
 
+      # Java and jq are always needed (apksigner requires Java even on cache hits).
+      - name: Install system dependencies
+        run: sudo apt-get install -y openjdk-17-jdk-headless unzip jq
+
       - name: Install Android SDK + NDK
         if: steps.sdk-cache.outputs.cache-hit != 'true'
         run: |
-          sudo apt-get install -y openjdk-17-jdk-headless unzip
           mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
           curl -sL \
             "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
@@ -136,11 +139,22 @@ jobs:
         id: release
         run: |
           TAG="${{ steps.meta.outputs.tag }}"
-          RELEASE_ID=$(curl -sf -X POST "$GITEA_API/repos/$REPO/releases" \
+          # Try to create; fall back to fetching the existing release on 409.
+          RESPONSE=$(curl -s -o /tmp/release.json -w "%{http_code}" \
+            -X POST "$GITEA_API/repos/$REPO/releases" \
             -H "Authorization: token ${{ secrets.CI_TOKEN }}" \
             -H "Content-Type: application/json" \
-            -d "{\"tag_name\":\"$TAG\",\"name\":\"$TAG\",\"draft\":false,\"prerelease\":false}" \
-            | jq -r '.id')
+            -d "{\"tag_name\":\"$TAG\",\"name\":\"$TAG\",\"draft\":false,\"prerelease\":false}")
+          if [ "$RESPONSE" = "409" ]; then
+            curl -sf "$GITEA_API/repos/$REPO/releases/tags/$TAG" \
+              -H "Authorization: token ${{ secrets.CI_TOKEN }}" \
+              > /tmp/release.json
+          elif [ "$RESPONSE" != "201" ]; then
+            echo "Release creation failed with HTTP $RESPONSE"
+            cat /tmp/release.json
+            exit 1
+          fi
+          RELEASE_ID=$(jq -r '.id' /tmp/release.json)
           echo "release_id=$RELEASE_ID" >> "$GITHUB_OUTPUT"
 
       - name: Upload signed APK