funman300/Ferrous-Solitaire
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 28 Wiki Activity

fix(ci): always install Java regardless of SDK cache hit; harden release creation
Android Build / build-apk (push) Failing after 13s
Details
Build and Deploy / build-and-push (push) Successful in 38s
Details
Android Release / build-release-apk (push) Failing after 11s
Details

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
funman300
2026-05-14 10:11:39 -07:00
parent 88298206bb
commit 396ba6bc97
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/android-build.yml
+3 -1
View File
@@ -37,10 +37,12 @@ jobs:
path: ${{ env.ANDROID_SDK_ROOT }} path: ${{ env.ANDROID_SDK_ROOT }}
key: android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }} 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 - name: Install Android SDK + NDK
if: steps.sdk-cache.outputs.cache-hit != 'true' if: steps.sdk-cache.outputs.cache-hit != 'true'
run: | run: |
sudo apt-get install -y openjdk-17-jdk-headless unzip
mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
curl -sL \ curl -sL \
"https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \ "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
.gitea/workflows/android-release.yml
+18 -4
View File
@@ -34,10 +34,13 @@ jobs:
path: ${{ env.ANDROID_SDK_ROOT }} path: ${{ env.ANDROID_SDK_ROOT }}
key: android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }} 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 - name: Install Android SDK + NDK
if: steps.sdk-cache.outputs.cache-hit != 'true' if: steps.sdk-cache.outputs.cache-hit != 'true'
run: | run: |
sudo apt-get install -y openjdk-17-jdk-headless unzip
mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
curl -sL \ curl -sL \
"https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \ "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
@@ -136,11 +139,22 @@ jobs:
id: release id: release
run: | run: |
TAG="${{ steps.meta.outputs.tag }}" 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 "Authorization: token ${{ secrets.CI_TOKEN }}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d "{\"tag_name\":\"$TAG\",\"name\":\"$TAG\",\"draft\":false,\"prerelease\":false}" \ -d "{\"tag_name\":\"$TAG\",\"name\":\"$TAG\",\"draft\":false,\"prerelease\":false}")
| jq -r '.id') 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" echo "release_id=$RELEASE_ID" >> "$GITHUB_OUTPUT"
- name: Upload signed APK - name: Upload signed APK