From 8694f021baa722a3121416bed02399143b2f8d04 Mon Sep 17 00:00:00 2001 From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com> Date: Fri, 28 Jul 2023 15:39:32 -0300 Subject: [PATCH] fix workflow --- .github/workflows/create-release.yml | 66 ++++------------------------ app/release/output-metadata.json | 46 +++++++++++++++++++ 2 files changed, 54 insertions(+), 58 deletions(-) create mode 100644 app/release/output-metadata.json diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 19eddc9b..6e6c66c7 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -78,7 +78,6 @@ jobs: draft: false prerelease: false - # Google Play APK - name: Upload Play APK Universal Asset id: upload-release-asset-play-universal-apk uses: actions/upload-release-asset@v1 @@ -86,8 +85,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk - asset_name: amber-googleplay-universal-${{ github.ref_name }}.apk + asset_path: app/build/outputs/apk/release/app-play-universal-release-unsigned-signed.apk + asset_name: amber-universal-${{ github.ref_name }}.apk asset_content_type: application/zip - name: Upload Play APK x86 Asset @@ -97,8 +96,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk - asset_name: amber-googleplay-x86-${{ github.ref_name }}.apk + asset_path: app/build/outputs/apk/release/app-play-x86-release-unsigned-signed.apk + asset_name: amber-x86-${{ github.ref_name }}.apk asset_content_type: application/zip - name: Upload Play APK x86_64 Asset @@ -108,47 +107,10 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk - asset_name: amber-googleplay-x86_64-${{ github.ref_name }}.apk + asset_path: app/build/outputs/apk/release/app-play-x86_64-release-unsigned-signed.apk + asset_name: amber-x86_64-${{ github.ref_name }}.apk asset_content_type: application/zip - # F-Droid APK - - name: Upload F-Droid APK Universal Asset - id: upload-release-asset-fdroid-universal-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned-signed.apk - asset_name: amber-fdroid-universal-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload F-Droid APK x86 Asset - id: upload-release-asset-fdroid-x86-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned-signed.apk - asset_name: amber-fdroid-x86-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload F-Droid APK x86_64 Asset - id: upload-release-asset-fdroid-x86-64-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned-signed.apk - asset_name: amber-fdroid-x86_64-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - - # Google Play AAB - name: Upload Google Play AAB Asset id: upload-release-asset-play-aab uses: actions/upload-release-asset@v1 @@ -156,18 +118,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/bundle/playRelease/app-play-release.aab - asset_name: amber-googleplay-${{ github.ref_name }}.aab + asset_path: app/build/outputs/bundle/app-release.aab + asset_name: amber-${{ github.ref_name }}.aab asset_content_type: application/zip - - # FDroid AAB - - name: Upload F-Droid AAB Asset - id: upload-release-asset-fdroid-aab - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab - asset_name: amber-fdroid-${{ github.ref_name }}.aab - asset_content_type: application/zip \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 00000000..ae2fa70e --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,46 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.greenart7c3.nostrsigner", + "variantName": "release", + "elements": [ + { + "type": "UNIVERSAL", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.0.1", + "outputFile": "app-universal-release.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", + "value": "x86_64" + } + ], + "attributes": [], + "versionCode": 1, + "versionName": "0.0.1", + "outputFile": "app-x86_64-release.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", + "value": "x86" + } + ], + "attributes": [], + "versionCode": 1, + "versionName": "0.0.1", + "outputFile": "app-x86-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file