Compare commits
	
		
			6 Commits
		
	
	
		
			v1.12-r9c
			...
			v1.12-r9-b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 288539b902 | ||
|   | 61fd32f121 | ||
|   | 43108ec4a6 | ||
|   | 51089c6b98 | ||
|   | cf18fcf91c | ||
|   | da0513c768 | 
							
								
								
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -361,5 +361,3 @@ jobs: | |||||||
|         path: | |         path: | | ||||||
|           src/keepass2android/bin/*/*-Signed.apk |           src/keepass2android/bin/*/*-Signed.apk | ||||||
|  |  | ||||||
|     - name: Perform "make distclean" |  | ||||||
|       run: make distclean |  | ||||||
|   | |||||||
							
								
								
									
										25
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										25
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -89,6 +89,9 @@ jobs: | |||||||
|     - name: Install NuGet dependencies |     - name: Install NuGet dependencies | ||||||
|       run: make nuget Flavor=${{ matrix.flavor }} |       run: make nuget Flavor=${{ matrix.flavor }} | ||||||
|  |  | ||||||
|  |     - name: List apks | ||||||
|  |       run:  find . -type f -name "*.apk" | ||||||
|  |  | ||||||
|     - name: Build APK (net) |     - name: Build APK (net) | ||||||
|       env: |       env: | ||||||
|         KeyStore: "${{ github.workspace }}/kp2a.keystore" |         KeyStore: "${{ github.workspace }}/kp2a.keystore" | ||||||
| @@ -102,17 +105,23 @@ jobs: | |||||||
|       run: | |       run: | | ||||||
|         make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }} |         make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }} | ||||||
|      |      | ||||||
|  |     - name: List apks | ||||||
|  |       run:  find . -type f -name "*.apk" | ||||||
|      |      | ||||||
|     - name: Archive production artifacts |     - name: Archive production artifacts | ||||||
|       uses: actions/upload-artifact@v4 |       uses: actions/upload-artifact@v4 | ||||||
|       with: |       with: | ||||||
|         name: signed APK (built on ${{ github.job }}) |         name: keepass2android_${{ matrix.target }}_${{ matrix.flavor }} | ||||||
|         path: | |         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 |     - name: List apks | ||||||
|       uses: softprops/action-gh-release@v2 |       run:  find . -type f -name "*.apk" | ||||||
|       if: github.ref_type == 'tag' |        | ||||||
|       with: |     #- name: Upload APK to GitHub Release | ||||||
|         files: | |     #  uses: softprops/action-gh-release@v2 | ||||||
|             src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk |     #  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 | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							| @@ -316,10 +316,10 @@ manifestlink: | |||||||
| msbuild: manifestlink native java nuget  | 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 | 	$(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  | 	$(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-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-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 | 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-x86 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user