avoid building the "full" apk when calling apk_split

remove ls step in release
change build artifact release paths. make archive name depend on matrix variables.
2025-07-05 09:39:54 +02:00 · 2025-07-05 08:35:58 +02:00 · 2025-07-05 08:16:30 +02:00 · 2025-07-05 08:15:58 +02:00 · 2025-07-05 07:49:39 +02:00
3 changed files with 11 additions and 13 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -361,5 +361,3 @@ jobs:
        path: |
          src/keepass2android/bin/*/*-Signed.apk

-    - name: Perform "make distclean"
-      run: make distclean
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -102,17 +102,17 @@ jobs:
      run: |
        make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }}

-
    - 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/net8.0-android/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/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/net8.0-android/publish/*.apk
--- a/4
+++ b/4
@@ -316,10 +316,10 @@ manifestlink:
 msbuild: manifestlink native java nuget 
 	$(MSBUILD) src/KeePass.sln -target:keepass2android-app -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -p:BuildProjectReferences=true $(MSBUILD_PARAM) -p:Platform="Any CPU" -m

-apk: msbuild 
+apk: manifestlink native java nuget  
 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m 

-apk_split: msbuild
+apk_split: manifestlink native java nuget 
 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-arm
 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-arm64
 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-x86
Author	SHA1	Message	Date
Philipp Crocoll	61fd32f121	avoid building the "full" apk when calling apk_split	2025-07-05 09:39:54 +02:00
Philipp Crocoll	43108ec4a6	remove ls step in release	2025-07-05 08:35:58 +02:00
Philipp Crocoll	51089c6b98	change build artifact release paths. make archive name depend on matrix variables.	2025-07-05 08:16:30 +02:00
Philipp Crocoll	cf18fcf91c	remove distclean from build	2025-07-05 08:15:58 +02:00
Philipp Crocoll	da0513c768	don't create release but only list files to test the release workflow without polluting github releases	2025-07-05 07:49:39 +02:00