[Tooling] Fix Wear App Universal .apk download #11786
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iangmaia
added
the
category: tooling
iangmaia
force-pushed
the
iangmaia/fix-wear-app-universal-apk-download
branch
from
215bbad to
30c3adb
Compare
AliSoftware
reviewed
Jun 24, 2024
fastlane/Fastfile
Outdated
| @@ -1132,9 +1132,11 @@ platform :android do | |||
| private_lane :create_gh_release do |app:, version:, prerelease: false| | |||
| universal_apk_path = File.join(PROJECT_ROOT_FOLDER, 'artifacts', universal_apk_name(app, version)) | |||
|
|
|||
| # We have a convention that the Wear app's version code is incremented by 50000 | |||
There was a problem hiding this comment.
Suggested change
| # We have a convention that the Wear app's version code is incremented by 50000 | |
| # We have a convention that the Wear app's version code is offset by 50000 from the Mobile app's one | |
| # See https://github.com/woocommerce/woocommerce-android/blob/11ae376f2922e4b2eac3f87971b8c2246e56b37b/WooCommerce-Wear/build.gradle#L29 |
There was a problem hiding this comment.
Changed on 44dfb92
fastlane/Fastfile
Outdated
| universal_apk_path = File.join(PROJECT_ROOT_FOLDER, 'artifacts', universal_apk_name(app, version)) | ||
|
|
||
| # We have a convention that the Wear app's version code is incremented by 50000 | ||
| build_code_to_download = app == MOBILE_APP ? build_code_current : (build_code_current.to_i + 50_000).to_s |
There was a problem hiding this comment.
What about, to be consistent with how we implement this in other places:
validate_app_param!(app)
version_code_offset = { MOBILE_APP: 0, WEAR_APP: 50_000 }.fetch(app, 0)
download_universal_apk_from_google_play(
…
version_code: build_code_current + version_code_offset
…
)There was a problem hiding this comment.
Good idea 👍 updated on 44dfb92.
📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.
|
|
📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.
|
AliSoftware
reviewed
Jun 24, 2024
AliSoftware
reviewed
Jun 24, 2024
Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
AliSoftware
approved these changes
Jun 24, 2024
AliSoftware
reviewed
Jun 28, 2024
| universal_apk_path = File.join(PROJECT_ROOT_FOLDER, 'artifacts', universal_apk_name(app, version)) | ||
|
|
||
| # We have a convention that the Wear app's version code is offset by 50000 from the Mobile app's one | ||
| # See https://github.com/woocommerce/woocommerce-android/blob/11ae376f2922e4b2eac3f87971b8c2246e56b37b/WooCommerce-Wear/build.gradle#L29 | ||
| version_code_offset = { MOBILE_APP: 0, WEAR_APP: 50_000 }.fetch(app, 0) |
There was a problem hiding this comment.
So this ended up not working, because the { key1: value1 } syntax makes a hash whose key is the symbol :key1
So here our hash ends up having the literal keys :MOBILE_APP and :WEAR_APP instead of interpreting those as constant names representing strings.
The fix for this will be:
Suggested change
| version_code_offset = { MOBILE_APP: 0, WEAR_APP: 50_000 }.fetch(app, 0) | |
| version_code_offset = { MOBILE_APP => 0, WEAR_APP => 50_000 }.fetch(app, 0) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
During the GitHub Release creation step (
create_gh_releaselane), the build failed for the Wear app.This is due to the fact that we have a convention to increment the Wear App by 50000.
While running the
create_gh_releaselane, we try to download the Universal .apk from Google Play (calling the actiondownload_universal_apk_from_google_play) using the App version code, which fails for the Wear app.This PR fixes the issue by also adding a 50000 increment to the version code when trying to download the universal .apk while running a Wear App build.