Compare commits
	
		
			9 Commits
		
	
	
		
			v1.12-r9
			...
			v1.12-r9-b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 43108ec4a6 | ||
|   | 51089c6b98 | ||
|   | cf18fcf91c | ||
|   | da0513c768 | ||
|   | 37f520cdbe | ||
|   | c98572bee0 | ||
|   | b1774ffc4b | ||
|   | 57aaa0c4cd | ||
|   | b961ae1b33 | 
							
								
								
									
										10
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -313,6 +313,10 @@ jobs: | |||||||
|       run: | |       run: | | ||||||
|         dotnet workload update         |         dotnet workload update         | ||||||
|  |  | ||||||
|  |     - name: Select the manifest | ||||||
|  |       run: | | ||||||
|  |         make manifestlink Flavor=Net | ||||||
|  |  | ||||||
|     - name: Install NuGet dependencies (net) |     - name: Install NuGet dependencies (net) | ||||||
|       run: make nuget Flavor=Net |       run: make nuget Flavor=Net | ||||||
|  |  | ||||||
| @@ -331,6 +335,10 @@ jobs: | |||||||
|         path: | |         path: | | ||||||
|           src/keepass2android/bin/*/*-Signed.apk |           src/keepass2android/bin/*/*-Signed.apk | ||||||
|  |  | ||||||
|  |     - name: Select the manifest | ||||||
|  |       run: | | ||||||
|  |         make manifestlink Flavor=NoNet | ||||||
|  |  | ||||||
|     - name: Install NuGet dependencies (nonet) |     - name: Install NuGet dependencies (nonet) | ||||||
|       run: make nuget Flavor=NoNet |       run: make nuget Flavor=NoNet | ||||||
|  |  | ||||||
| @@ -353,5 +361,3 @@ jobs: | |||||||
|         path: | |         path: | | ||||||
|           src/keepass2android/bin/*/*-Signed.apk |           src/keepass2android/bin/*/*-Signed.apk | ||||||
|  |  | ||||||
|     - name: Perform "make distclean" |  | ||||||
|       run: make distclean |  | ||||||
|   | |||||||
							
								
								
									
										31
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										31
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,10 +3,9 @@ env: | |||||||
|   NAME: 'Release' |   NAME: 'Release' | ||||||
|  |  | ||||||
| on: | on: | ||||||
|   release: |   push: | ||||||
|     types: [created] |     tags: | ||||||
|   workflow_dispatch: # For manual testing |       - "v1.*" | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|  |  | ||||||
|   build-release: |   build-release: | ||||||
| @@ -83,13 +82,13 @@ jobs: | |||||||
|       run: | |       run: | | ||||||
|         dotnet workload update         |         dotnet workload update         | ||||||
|  |  | ||||||
|     - name: Install NuGet dependencies |  | ||||||
|       run: make nuget Flavor=${{ matrix.flavor }} |  | ||||||
|  |  | ||||||
|     - name: Select the manifest |     - name: Select the manifest | ||||||
|       run: | |       run: | | ||||||
|         make manifestlink Flavor=${{ matrix.flavor }} |         make manifestlink Flavor=${{ matrix.flavor }} | ||||||
|  |  | ||||||
|  |     - name: Install NuGet dependencies | ||||||
|  |       run: make nuget Flavor=${{ matrix.flavor }} | ||||||
|  |  | ||||||
|     - name: Build APK (net) |     - name: Build APK (net) | ||||||
|       env: |       env: | ||||||
|         KeyStore: "${{ github.workspace }}/kp2a.keystore" |         KeyStore: "${{ github.workspace }}/kp2a.keystore" | ||||||
| @@ -103,17 +102,17 @@ jobs: | |||||||
|       run: | |       run: | | ||||||
|         make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }} |         make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }} | ||||||
|  |  | ||||||
|  |  | ||||||
|     - 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/**/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: Upload APK to GitHub Release | ||||||
|       uses: softprops/action-gh-release@v2 |     #  uses: softprops/action-gh-release@v2 | ||||||
|       if: github.ref_type == 'tag' |     #  if: github.ref_type == 'tag' | ||||||
|       with: |     #  with: | ||||||
|         files: | |     #    files: | | ||||||
|             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 | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||||
|       android:versionCode="215" |       android:versionCode="217" | ||||||
|       android:versionName="1.12-r9" |       android:versionName="1.12-r9c" | ||||||
|       package="keepass2android.keepass2android" |       package="keepass2android.keepass2android" | ||||||
|       xmlns:tools="http://schemas.android.com/tools" |       xmlns:tools="http://schemas.android.com/tools" | ||||||
|       android:installLocation="auto"> |       android:installLocation="auto"> | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||||
|       android:versionCode="215" |       android:versionCode="217" | ||||||
|       android:versionName="1.12-r9" |       android:versionName="1.12-r9c" | ||||||
|       package="keepass2android.keepass2android_nonet" |       package="keepass2android.keepass2android_nonet" | ||||||
|       xmlns:tools="http://schemas.android.com/tools" |       xmlns:tools="http://schemas.android.com/tools" | ||||||
|       android:installLocation="auto"> |       android:installLocation="auto"> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user