testing

.github/workflows/main.yml

@@ -61,7 +61,7 @@ jobs:
           sed -i 's/applicationId = namespace/applicationId = "'"$APPLICATION_ID"'"/' app-release/app/build.gradle.kts
           sed -i 's/versionName = .*/versionName = "'"$VERSION_NAME"'"/' app-release/app/build.gradle.kts
           sed -i "s/versionCode = .*/versionCode = $VERSION_CODE/" app-release/app/build.gradle.kts
-          sed -i "s/setProperty(\"archivesBaseName\", \".*\")/setProperty(\"archivesBaseName\", \"alaskartv-androidtv-v$VERSION_NAME\")/" app-release/app/build.gradle.kts
+          sed -i "s/setProperty(\"archivesBaseName\", \".*\")/setProperty(\"archivesBaseName\", \"alaskartv-androidtv-$VERSION_NAME\")/" app-release/app/build.gradle.kts
 
       - name: Update about.kt
         run: |
@@ -161,57 +161,30 @@ jobs:
           name: debug-symbols
           path: app-release/app/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/*
 
-  publish:
-    runs-on: docker
-    needs: build
-    if: github.event_name == 'workflow_dispatch'
-    container: ghcr.io/catthehacker/ubuntu:act-latest
-
-    steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v4
-
-    - name: Get latest successful run ID
-      id: get-run
+      - name: Prepare Release Assets
         run: |
-           LATEST_RUN=$(curl -s -H "Authorization: token ${FORGEJO_TOKEN}" \
-            "https://git.askar.tv/api/v1/repos/nomad/alaskartv-app/actions/runs?status=success&event=push&branch=main" | \
-            jq -r '.[] | select(.workflow_id=="main.yml") | .id' | head -n1)
-           echo "run_id=$LATEST_RUN" >> "$GITHUB_OUTPUT"
+          mkdir -p ./release-assets
 
+          mv ${{ steps.sign_apk.outputs.signedFiles }} ./release-assets/AlaskarTV-${{ env.VERSION_NAME }}-signed.apk
+          mv ${{ steps.sign_aab.outputs.signedFiles }} ./release-assets/AlaskarTV-${{ env.VERSION_NAME }}-signed.aab
+          zip -j ./release-assets/debug-symbols.zip app-release/app/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/*
 
-    - name: Download Signed AAB
-      uses: actions/download-artifact@v3
+          # cp whatsnew.txt ./release-assets/release-notes.txt
+        env:
+          VERSION_NAME: ${{ env.VERSION_NAME }}
+          VERSION_CODE: ${{ env.VERSION_CODE }}
+
+      - name: Create Release and Upload Assets
+        uses: forgejo/release@v2
         with:
-        name: signed-aab
-        path: ./release
-
-
-    - name: Download Debug Symbols
-      uses: actions/download-artifact@v3
-      with:
-        name: debug-symbols
-        path: ./release/symbols
-
-    - name: Use What's New Message
-      run: |
-        mkdir ./release/whatsnew
-        cp whatsnew.txt ./release/whatsnew/whatsnew-en-US
-
-    - name: List Downloaded Files
-      run: ls -laR ./release
-
-    # - name: Create service_account.json
-    #   run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-    #
-    # - name: Deploy to Google Play
-    #   uses: https://github.com/r0adkll/upload-google-play@v1
-    #   with:
-    #     serviceAccountJson: service_account.json
-    #     packageName: org.askartv.tv
-    #     releaseFiles: "./release/*.aab"
-    #     debugSymbols: "./release/symbols"
-    #     track: production
-    #     status: completed
-    #     whatsNewDirectory: ./release/whatsnew
-
+          url: https://git.askar.tv
+          repo: nomad/alaskartv-app
+          token: ${{ secrets.FORGEJO_TOKEN }}
+          tag: "${{ env.VERSION_NAME }}"
+          title: "AlaskarTV-${{ env.VERSION_NAME }}-${{ env.VERSION_CODE }}"
+          release-dir: ./release-assets
+          direction: upload
+        env:
+          FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }}
+          VERSION_NAME: ${{ env.VERSION_NAME }}
+          VERSION_CODE: ${{ env.VERSION_CODE }}