change build artifact release paths. make archive name depend on matrix variables.

.github/workflows/build.yml

@@ -313,6 +313,10 @@ jobs:
       run: |
         dotnet workload update        
 
+    - name: Select the manifest
+      run: |
+        make manifestlink Flavor=Net
+
     - name: Install NuGet dependencies (net)
       run: make nuget Flavor=Net
 
@@ -331,6 +335,10 @@ jobs:
         path: |
           src/keepass2android/bin/*/*-Signed.apk
 
+    - name: Select the manifest
+      run: |
+        make manifestlink Flavor=NoNet
+
     - name: Install NuGet dependencies (nonet)
       run: make nuget Flavor=NoNet
 
@@ -353,5 +361,3 @@ jobs:
         path: |
           src/keepass2android/bin/*/*-Signed.apk
 
-    - name: Perform "make distclean"
-      run: make distclean

.github/workflows/release.yml

@@ -3,10 +3,9 @@ env:
   NAME: 'Release'
 
 on:
-  release:
-    types: [created]
-  workflow_dispatch: # For manual testing
-
+  push:
+    tags:
+      - "v1.*"
 jobs:
 
   build-release:
@@ -83,13 +82,13 @@ jobs:
       run: |
         dotnet workload update        
 
-    - name: Install NuGet dependencies
-      run: make nuget Flavor=${{ matrix.flavor }}
-
     - name: Select the manifest
       run: |
         make manifestlink Flavor=${{ matrix.flavor }}
 
+    - name: Install NuGet dependencies
+      run: make nuget Flavor=${{ matrix.flavor }}
+
     - name: Build APK (net)
       env:
         KeyStore: "${{ github.workspace }}/kp2a.keystore"
@@ -103,17 +102,23 @@ jobs:
       run: |
         make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }}
 
+    - name: List files
+      shell: bash
+      run: |
+        ls src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk
+        ls src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk
 
     - name: Archive production artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: signed APK (built on ${{ github.job }})
+        name: keepass2android_${{ matrix.target }}_${{ matrix.flavor }}
         path: |
-          src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/**/publish/*.apk
+          src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk
+          src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk
     
-    - name: Upload APK to GitHub Release
-      uses: softprops/action-gh-release@v2
-      if: github.ref_type == 'tag'
-      with:
-        files: |
-            src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/**/publish/*.apk
+    #- name: Upload APK to GitHub Release
+    #  uses: softprops/action-gh-release@v2
+    #  if: github.ref_type == 'tag'
+    #  with:
+    #    files: |
+    #        src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk

src/keepass2android-app/Manifests/AndroidManifest_net.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="215"
-      android:versionName="1.12-r9"
+      android:versionCode="217"
+      android:versionName="1.12-r9c"
       package="keepass2android.keepass2android"
       xmlns:tools="http://schemas.android.com/tools"
       android:installLocation="auto">

src/keepass2android-app/Manifests/AndroidManifest_nonet.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="215"
-      android:versionName="1.12-r9"
+      android:versionCode="217"
+      android:versionName="1.12-r9c"
       package="keepass2android.keepass2android_nonet"
       xmlns:tools="http://schemas.android.com/tools"
       android:installLocation="auto">