diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 66dbc04472d2..cb3bc54e3970 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -248,7 +248,7 @@ jobs: - name: Get Android native version id: getAndroidVersion - run: echo "VERSION_CODE=$(grep -o 'versionCode\s\+[0-9]\+' android/app/build.gradle | awk '{ print $2 }')" >> "$GITHUB_OUTPUT" + run: echo "VERSION_CODE=$(grep -oP 'android:versionCode="\K[0-9]+' ../Android/AndroidManifest.xml)" >> "$GITHUB_OUTPUT" - name: Build Android app if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} @@ -264,9 +264,6 @@ jobs: env: VERSION: ${{ steps.getAndroidVersion.outputs.VERSION_CODE }} - - name: Add debug - run: ls -laR . - - name: Get current Android rollout percentage id: getAndroidRolloutPercentage uses: ./.github/actions/javascript/getAndroidRolloutPercentage diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 30c82bbf2ec7..c350e3b2da04 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -242,15 +242,10 @@ platform :android do lane :upload_google_play_production_hybrid_rollout do # Google is very unreliable, so we retry a few times ENV["SUPPLY_UPLOAD_MAX_RETRIES"]="5" - betaVersionCodes = google_play_track_version_codes( - package_name: "org.me.mobiexpensifyg", - json_key: './android-fastlane-json-key.json', - track: 'beta' - ) upload_to_play_store( package_name: "org.me.mobiexpensifyg", json_key: './android-fastlane-json-key.json', - version_code: betaVersionCodes.sort.last, # Get the latest version code + version_code: ENV["VERSION"].to_i, track: 'beta', track_promote_to: 'production', rollout: '0.01',