diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 9a0924a..81edfd1 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -1,6 +1,6 @@ name: release -on: +"on": push: tags: - 'v*.*.*' @@ -15,6 +15,7 @@ jobs: run: | git clone https://git.trevena.info/nick/incido.git repo cd repo + git fetch origin tag ${{ secrets.TOKEN/refs/tags/*:refs/tags/* }} --no-tags || true - name: Set up JDK 17 run: | @@ -39,38 +40,30 @@ jobs: mkdir -p "$SDK/cmdline-tools" mv /tmp/cmdline-tools-extract/cmdline-tools "$SDK/cmdline-tools/latest" rm -rf /tmp/cmdline-tools.zip /tmp/cmdline-tools-extract - yes | "$SDK/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null 2>&1 || true - "$SDK/cmdline-tools/latest/bin/sdkmanager" --install \ - "platform-tools" \ - "platforms;android-34" \ - "build-tools;34.0.0" > /dev/null 2>&1 + yes | $SDK/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null 2>&1 || true fi echo "ANDROID_HOME=$SDK" >> $GITHUB_ENV - echo "ANDROID_SDK_ROOT=$SDK" >> $GITHUB_ENV echo "PATH=$SDK/cmdline-tools/latest/bin:$SDK/platform-tools:$PATH" >> $GITHUB_ENV + $SDK/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" "platforms;android-34" "build-tools;34.0.0" > /dev/null 2>&1 || true - name: Build debug + release APKs - env: - GITHUB_TOKEN: ${{ secrets.TOKEN }} run: | - set -e cd repo - chmod +x gradlew + git checkout ${{ github.ref_name }} mkdir -p keystore - keytool -genkey -noprompt -v \ - -keystore keystore/release.jks \ - -keyalg RSA -keysize 2048 -validity 10000 \ - -alias incido \ - -storepass incido_dev_keystore \ - -keypass incido_dev_keystore \ - -dname "CN=Incido Dev, OU=Local, O=Incido, L=Local, ST=Local, C=NZ" + echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore/release.jks export JAVA_HOME=/tmp/gitea-runner-work/jdk export ANDROID_HOME=/tmp/gitea-runner-work/android-sdk export PATH=$JAVA_HOME/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH - ./gradlew assembleDebug assembleRelease --no-daemon + chmod +x ./gradlew + ./gradlew --stop || true + ./gradlew assembleDebug assembleRelease --no-daemon -q + + ls -la app/build/outputs/apk/*/release/ 2>/dev/null || true + ls -la app/build/outputs/apk/*/debug/ 2>/dev/null || true - name: Create release + attach both APKs env: @@ -78,9 +71,11 @@ jobs: run: | set -e cd repo - TAG="${GITHUB_REF##*/}" + TAG="${{ github.ref_name }}" VERSION="${TAG#v}" API="https://git.trevena.info/api/v1/repos/nick/incido" + APK_DEBUG="Incido-$VERSION-debug.apk" + APK_RELEASE="Incido-$VERSION-release.apk" echo "Checking for existing release for tag: $TAG" RELEASE_ID=$(curl -s "$API/releases/tags/$TAG" \ @@ -91,50 +86,42 @@ jobs: echo "Found existing release ID: $RELEASE_ID (reusing it)" else echo "No existing release -- creating one for tag: $TAG" - python3 -c "import json,sys;payload={'tag_name':sys.argv[1],'name':sys.argv[1],'draft':False,'prerelease':False};open('/tmp/release_payload.json','w').write(json.dumps(payload))" "$TAG" + python3 -c "import sys,json; sys.stdout.write(json.dumps({'tag_name': '$TAG', 'name': '$TAG', 'draft': False, 'prerelease': False}))" \ + > /tmp/release_payload.json RELEASE_ID=$(curl -s -X POST "$API/releases" \ -H "Authorization: token $GH_TOKEN" \ -H "Content-Type: application/json" \ -d @/tmp/release_payload.json \ | python3 -c "import sys,json; print(json.load(sys.stdin).get('id','') or '')") - echo "Created release ID: $RELEASE_ID" fi - if [ -z "$RELEASE_ID" ]; then - echo "ERROR: Could not get or create release for tag $TAG" - exit 1 - fi + echo "Release ID: $RELEASE_ID" + if [ -z "$RELEASE_ID" ]; then echo "ERROR: Failed to get release ID"; exit 1; fi - for APK in "Incido-${VERSION}-debug.apk" "Incido-${VERSION}-release.apk"; do - if [ ! -f "$APK" ]; then - echo "SKIP: $APK not found" - continue + for APK in "$APK_DEBUG" "$APK_RELEASE"; do + APK_PATH="app/build/outputs/apk/*/release/$APK" + APK_PATH=$(echo "$APK_PATH" | tr '*' '?') + if [ ! -f "$APK_PATH" ]; then + APK_PATH="app/build/outputs/apk/*/*/$APK" + APK_PATH=$(echo "$APK_PATH" | tr '*' '?') + fi + if [ ! -f "$APK_PATH" ]; then + echo "ERROR: APK not found: $APK" + exit 1 fi - python3 - << 'PYEOF' - import sys, json, urllib.request - - api = sys.argv[1] - release_id = sys.argv[2] - apk_name = sys.argv[3] - token = sys.argv[4] - - req = urllib.request.Request( - f"{api}/releases/{release_id}/assets", - headers={"Authorization": f"token {token}"} - ) - with urllib.request.urlopen(req) as resp: - assets = json.load(resp) - - for a in assets: - if a.get("name") == apk_name: - print(a["id"], flush=True) - break - else: - print("", flush=True) -PYEOF - - ASSET_ID=$(python3 - "$API" "$RELEASE_ID" "$APK" "$GH_TOKEN") + ASSET_ID=$(python3 - "$API" "$RELEASE_ID" "$APK" "$GH_TOKEN" << 'PYEOF') + import sys, json + api, release_id, apk, token = sys.argv[1:] + resp = __import__('urllib.request').urlopen( + __import__('urllib.request').Request( + f"{api}/releases/{release_id}/assets?filename={apk}", + headers={"Authorization": f"token {token}"})) + for a in json.loads(resp.read()).get('assets', []): + if a['name'] == apk: + print(a['id'], flush=True) + break + PYEOF if [ -n "$ASSET_ID" ]; then echo "Deleting stale asset $ASSET_ID ($APK)" @@ -143,15 +130,8 @@ PYEOF fi echo "Attaching $APK to release $RELEASE_ID" - RESPONSE=$(curl -s \ - --max-time 300 \ - --retry 3 \ - --retry-delay 10 \ - --retry-connrefuse \ - -X POST \ - "$API/releases/$RELEASE_ID/assets?name=$APK" \ + curl -s -X POST "$API/releases/$RELEASE_ID/assets" \ -H "Authorization: token $GH_TOKEN" \ - -H "Content-Type: application/octet-stream" \ - --data-binary "@$APK") - echo "Attach response: $RESPONSE" + -F "files=@$APK_PATH" \ + --max-time 300 --retry 3 --retry-delay 10 --retry-connrefuse done