Merge actions

.github/workflows/android.yml

@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches: [ "master" ]
+    tags: [ "*" ]
   pull_request:
     branches: [ "master" ]
 
@@ -37,15 +38,22 @@ jobs:
     - name: Archive APK
       uses: actions/upload-artifact@v4
       with:
-        name: app-release.apk
+        name: app-artifacts
-        path: app/build/outputs/apk/release/app-release.apk
+        path: |
-    - name: Archive app manifest
+          app/build/outputs/apk/release/app-release.apk
-      uses: actions/upload-artifact@v4
+          app/manifest.json
+          app/karoo-reminder.png
+
+    - name: Create Release
+      id: create_release
+      uses: ncipollo/release-action@v1
+      if: startsWith(github.ref, 'refs/tags/')
       with:
-        name: manifest.json
+        tag_name: ${{ github.ref }}
-        path: app/manifest.json
+        release_name: ${{ github.ref }}
-    - name: Archive app icon
+        draft: true
-      uses: actions/upload-artifact@v4
+        prerelease: false
-      with:
+        generateReleaseNotes: true
-        name: karoo-reminder.png
+        artifacts: app/build/outputs/apk/release/app-release.apk, app/manifest.json, app/karoo-reminder.png
-        path: app/karoo-reminder.png
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,42 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download APK artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: app-release.apk
-
-      - name: Download manifest artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: manifest.json
-
-      - name: Download app icon artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: karoo-reminder.png
-
-      - name: Create Release
-        id: create_release
-        uses: ncipollo/release-action@v1
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: true
-          prerelease: false
-          generateReleaseNotes: true
-          artifacts: app-release.apk, manifest.json, karoo-reminder.png
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}