diff --git a/.github/workflows/release-mobile.yml b/.github/workflows/release-mobile.yml index e70a474f25..a25bc0e41f 100644 --- a/.github/workflows/release-mobile.yml +++ b/.github/workflows/release-mobile.yml @@ -200,6 +200,9 @@ jobs: - build-android-web steps: - uses: actions/checkout@v4 + - name: Setup Version + id: version + uses: ./.github/actions/setup-version - name: Download mobile artifact uses: actions/download-artifact@v4 with: @@ -258,13 +261,14 @@ jobs: AFFINE_ANDROID_KEYSTORE_PASSWORD: ${{ secrets.AFFINE_ANDROID_KEYSTORE_PASSWORD }} AFFINE_ANDROID_KEYSTORE_ALIAS_PASSWORD: ${{ secrets.AFFINE_ANDROID_KEYSTORE_ALIAS_PASSWORD }} AFFINE_ANDROID_SIGN_KEYSTORE: ${{ secrets.AFFINE_ANDROID_SIGN_KEYSTORE }} - + VERSION_NAME: ${{ steps.version.outputs.APP_VERSION }} - name: Upload to Google Play uses: r0adkll/upload-google-play@v1 if: ${{ env.BUILD_TARGET == 'distribution' }} with: serviceAccountJson: ${{ steps.auth.outputs.credentials_file_path }} packageName: app.affine.pro + releaseName: ${{ steps.version.outputs.APP_VERSION }} releaseFiles: packages/frontend/apps/android/App/app/build/outputs/bundle/${{ env.BUILD_TYPE }}Release/app-${{ env.BUILD_TYPE }}-release-signed.aab track: internal status: draft diff --git a/packages/frontend/apps/android/App/app/build.gradle b/packages/frontend/apps/android/App/app/build.gradle index 336be8d87d..38a9f0a267 100644 --- a/packages/frontend/apps/android/App/app/build.gradle +++ b/packages/frontend/apps/android/App/app/build.gradle @@ -25,7 +25,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 - versionName "1.0" + versionName System.getenv('VERSION_NAME') ?: 'v1.0.0-local' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.