release apk

2025-12-14 10:05:01 +00:00
parent f0dfbd185b
commit eb01cf0e8e
4 changed files with 195 additions and 100 deletions
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -81,16 +81,63 @@ jobs:
      - name: Flutter dependencies
        run: flutter pub get

-      - name: Build APK (release)
+      - name: Prepare Android keystore (optional)
+        if: ${{ secrets.ANDROID_KEYSTORE_BASE64 != '' }}
        run: |
-          flutter build apk --release
-          cp build/app/outputs/flutter-apk/app-release.apk app-release.apk
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > android-release-key.jks
+          echo "ANDROID_KEYSTORE_PATH=$PWD/android-release-key.jks" >> "$GITHUB_ENV"
+          echo "ANDROID_KEYSTORE_PASSWORD=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" >> "$GITHUB_ENV"
+          echo "ANDROID_KEY_ALIAS=${{ secrets.ANDROID_KEY_ALIAS }}" >> "$GITHUB_ENV"
+          echo "ANDROID_KEY_PASSWORD=${{ secrets.ANDROID_KEY_PASSWORD }}" >> "$GITHUB_ENV"
+
+      - name: Build Android App Bundle (release)
+        run: flutter build appbundle --release
+
+      - name: Download bundletool
+        run: |
+          BUNDLETOOL_VERSION=1.15.6
+          curl -fsSL -o bundletool.jar "https://github.com/google/bundletool/releases/download/${BUNDLETOOL_VERSION}/bundletool-all-${BUNDLETOOL_VERSION}.jar"
+
+      - name: Extract universal APK from bundle
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+        run: |
+          set -euo pipefail
+
+          BUNDLE="build/app/outputs/bundle/release/app-release.aab"
+          OUTPUT_APKS="app-release.apks"
+          APK_NAME="mileograph-${BASE_VERSION}.apk"
+
+          if [ ! -f "$BUNDLE" ]; then
+            echo "Bundle not found at $BUNDLE"
+            exit 1
+          fi
+
+          SIGNING_ARGS=()
+          if [ -n "${ANDROID_KEYSTORE_PATH:-}" ] && [ -f "$ANDROID_KEYSTORE_PATH" ]; then
+            SIGNING_ARGS+=(--ks="$ANDROID_KEYSTORE_PATH")
+            SIGNING_ARGS+=(--ks-pass="pass:${ANDROID_KEYSTORE_PASSWORD}")
+            SIGNING_ARGS+=(--ks-key-alias="${ANDROID_KEY_ALIAS}")
+            KEY_PASS="${ANDROID_KEY_PASSWORD:-$ANDROID_KEYSTORE_PASSWORD}"
+            SIGNING_ARGS+=(--key-pass="pass:${KEY_PASS}")
+          else
+            echo "No release keystore provided; bundletool will sign with the debug keystore."
+          fi
+
+          java -jar bundletool.jar build-apks \
+            --bundle="$BUNDLE" \
+            --output="$OUTPUT_APKS" \
+            --mode=universal \
+            "${SIGNING_ARGS[@]}"
+
+          unzip -p "$OUTPUT_APKS" universal.apk > "$APK_NAME"
+          ls -lh "$APK_NAME"

      - name: Upload Android APK artifact
        uses: actions/upload-artifact@v3
        with:
          name: android-apk
-          path: app-release.apk
+          path: mileograph-${{ needs.meta.outputs.base_version }}.apk

  linux-build:
    runs-on: ubuntu-latest
@@ -157,54 +204,36 @@ jobs:
          name: android-apk
          path: artifacts

-      - name: Download Linux bundle
-        if: ${{ github.ref == 'refs/heads/dev' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: linux-bundle
-          path: artifacts
-
-      - name: Download Windows bundle (optional)
-        if: ${{ github.ref == 'refs/heads/dev' && env.BUILD_WINDOWS == 'true' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: windows-zip
-          path: artifacts
-
-      - name: Prepare artefacts and tag
+      - name: Prepare APK and tag
        if: ${{ github.ref == 'refs/heads/dev' }}
        id: bundle
        run: |
          BASE="${{ needs.meta.outputs.base_version }}"
-          TAG="v${BASE}-dev"
+          TAG="v${BASE}-dev.${{ github.run_number }}"

-          mv artifacts/app-release.apk "artifacts/app-${BASE}-dev.apk"
-          mv artifacts/app-linux-x64.tar.gz "artifacts/app-linux-x64-${BASE}-dev.tar.gz"
-          if [ -f artifacts/app-windows-x64.zip ]; then
-            mv artifacts/app-windows-x64.zip "artifacts/app-windows-x64-${BASE}-dev.zip"
-          fi
+          mv "artifacts/mileograph-${BASE}.apk" "artifacts/mileograph-${BASE}-dev.apk"

          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "files=artifacts/*" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/mileograph-${BASE}-dev.apk" >> "$GITHUB_OUTPUT"

      - name: Create prerelease on Gitea
        if: ${{ github.ref == 'refs/heads/dev' }}
        uses: ncipollo/release-action@v1
        with:
-          tag: v${{ needs.meta.outputs.base_version }}-dev.${{ github.run_number }}
+          tag: ${{ steps.bundle.outputs.tag }}
          name: v${{ needs.meta.outputs.base_version }}-dev build ${{ github.run_number }}
          prerelease: true
          commit: ${{ github.sha }}
          token: ${{ secrets.GITEA_TOKEN }}
          # NOTE: no `artifacts:` here

-      - name: Attach artefacts to Gitea release
+      - name: Attach APK to Gitea release
        if: ${{ github.ref == 'refs/heads/dev' }}
        run: |
          set -euo pipefail

-          BASE="${{ needs.meta.outputs.base_version }}"
-          TAG="v${BASE}-dev.${{ github.run_number }}"
+          TAG="${{ steps.bundle.outputs.tag }}"
+          APK="${{ steps.bundle.outputs.apk }}"

          # 1. Find release ID by tag
          RELEASE_JSON=$(curl -sS \
@@ -215,19 +244,16 @@ jobs:

          echo "Release ID: $RELEASE_ID"

-          # 2. Upload each artefact with multipart/form-data
-          for f in artifacts/*; do
-            [ -f "$f" ] || continue
-            NAME=$(basename "$f")
-            echo "Uploading $NAME"
+          # 2. Upload APK with multipart/form-data
+          NAME=$(basename "$APK")
+          echo "Uploading $NAME"

-            curl -sS -X POST \
-              -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-              -F "attachment=@${f}" \
-              -F "name=${NAME}" \
-              "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
-              >/dev/null
-          done
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${APK}" \
+            -F "name=${NAME}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null

  release-master:
    runs-on: ubuntu-latest
@@ -236,6 +262,15 @@ jobs:
      - android-build
      - linux-build
    steps:
+      - name: Install jq
+        run: |
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          else
+            SUDO=""
+          fi
+          $SUDO apt-get update
+          $SUDO apt-get install -y jq
      - name: Download Android APK
        if: ${{ github.ref == 'refs/heads/master' }}
        uses: actions/download-artifact@v3
@@ -243,35 +278,15 @@ jobs:
          name: android-apk
          path: artifacts

-      - name: Download Linux bundle
-        if: ${{ github.ref == 'refs/heads/master' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: linux-bundle
-          path: artifacts
-
-      - name: Download Windows bundle (optional)
-        if: ${{ github.ref == 'refs/heads/master' && env.BUILD_WINDOWS == 'true' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: windows-zip
-          path: artifacts
-
-      - name: Prepare artefacts and tag
+      - name: Prepare APK and tag
        if: ${{ github.ref == 'refs/heads/master' }}
        id: bundle
        run: |
          BASE="${{ needs.meta.outputs.base_version }}"
          TAG="v${BASE}"

-          mv artifacts/app-release.apk "artifacts/app-${BASE}.apk"
-          mv artifacts/app-linux-x64.tar.gz "artifacts/app-linux-x64-${BASE}.tar.gz"
-          if [ -f artifacts/app-windows-x64.zip ]; then
-            mv artifacts/app-windows-x64.zip "artifacts/app-windows-x64-${BASE}.zip"
-          fi
-
          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "files=artifacts/*" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/mileograph-${BASE}.apk" >> "$GITHUB_OUTPUT"

      - name: Create release on Gitea
        if: ${{ github.ref == 'refs/heads/master' }}
@@ -281,4 +296,32 @@ jobs:
          name: ${{ steps.bundle.outputs.tag }}
          prerelease: false
          token: ${{ secrets.GITEA_TOKEN }}
-          artifacts: ${{ steps.bundle.outputs.files }}
+          commit: ${{ github.sha }}
+
+      - name: Attach APK to Gitea release
+        if: ${{ github.ref == 'refs/heads/master' }}
+        run: |
+          set -euo pipefail
+
+          TAG="${{ steps.bundle.outputs.tag }}"
+          APK="${{ steps.bundle.outputs.apk }}"
+
+          # 1. Find release ID by tag
+          RELEASE_JSON=$(curl -sS \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/tags/${TAG}")
+
+          RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
+
+          echo "Release ID: $RELEASE_ID"
+
+          # 2. Upload APK with multipart/form-data
+          NAME=$(basename "$APK")
+          echo "Uploading $NAME"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${APK}" \
+            -F "name=${NAME}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null