diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7b826b..81d4817 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,12 +59,16 @@ jobs: keyStorePassword: ${{ secrets.SIGNING_STORE_PASSWORD }} keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }} + - name: Rename APK + run: | + mv "${{ steps.sign_apk.outputs.signedReleaseFile }}" app-release.apk + - name: Upload artifacts (Actions) uses: actions/upload-artifact@v4 with: name: release-build path: | - ${{ steps.sign_apk.outputs.signedReleaseFile }} + app-release.apk ${{ steps.sign_aab.outputs.signedReleaseFile }} - name: Create GitHub Release @@ -72,12 +76,12 @@ jobs: uses: softprops/action-gh-release@v2 with: files: | - ${{ steps.sign_apk.outputs.signedReleaseFile }} + app-release.apk ${{ steps.sign_aab.outputs.signedReleaseFile }} generate_release_notes: true draft: true - prerelease: true + prerelease: false - name: Cleanup secrets if: always() - run: rm -f local.properties + run: rm -f local.properties \ No newline at end of file diff --git a/.gitignore b/.gitignore index 6efb2fe..48f6e21 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /.idea/ /local.properties google_maps_api.xml +/build/ /app/src/.DS_Store /app/src/debug/.DS_Store /app/src/debug/res/.DS_Store diff --git a/app/.gitignore b/app/.gitignore index 42afabf..956c004 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/release \ No newline at end of file diff --git a/app/release/app-release.aab b/app/release/app-release.aab deleted file mode 100644 index db4e30e..0000000 Binary files a/app/release/app-release.aab and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json deleted file mode 100644 index 3555a3d..0000000 --- a/app/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "edu.rpi.shuttletracker", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "properties": [], - "versionCode": 3, - "versionName": "1.0", - "enabled": true, - "outputFile": "app-release.apk" - } - ] -} \ No newline at end of file