Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #4850: Bump version codes for alpha 0.10 release, and fix version code ordering #4851

Merged
merged 8 commits into from
Mar 10, 2023

Conversation

BenHenning
Copy link
Member

@BenHenning BenHenning commented Jan 20, 2023

Explanation

Fixes #4850

This PR introduces the necessary version code updates for an upcoming 0.10 alpha release (2 different RCs). It also fixes the order of version codes such that less stable versions of the app (i.e. build flavors) take priority over more stable ones (so that users signed up for an earlier pre-release will get that over later versions, e.g. users would receive an alpha version of the app over beta if they're in both). This happens because Play Store uses version codes as the actual comparable versions for uploaded binaries, and it picks the binary with the highest version code to be installed based on all that a user may qualify for (based on which release tracks that they're participating in). The assumption here is that newer versions maintain backward compatibility with older versions, and this is something we will continue to aim for (though with minimal guarantees for pre-release versions).

Note that one unfortunate side effect of this change is that local installs of the app will require manually uninstalling when installing a "more stable" build flavor (though technically this was an issue in the other direction previously). This does make "upgrade" flows a little trickier to test locally unless using pre-assembled binaries.

This PR also updates app versioning such that the version now includes the local branch's commit rather than the common commit with develop (to ensure RC rebuilds have properly unique version names rather than sharing one version name for the release branch).

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

N/A -- This is an infrastructure-only change.

@BenHenning BenHenning marked this pull request as ready for review January 20, 2023 22:44
@BenHenning BenHenning requested a review from seanlip January 20, 2023 22:44
@BenHenning
Copy link
Member Author

@seanlip PTAL for codeowners.

@BenHenning BenHenning enabled auto-merge (squash) January 20, 2023 22:45
@BenHenning BenHenning disabled auto-merge January 21, 2023 02:27
@seanlip seanlip assigned BenHenning and unassigned seanlip Jan 21, 2023
@seanlip
Copy link
Member

seanlip commented Jan 21, 2023

@BenHenning Not sure if I should merge this yet, feel free to do so once you're ready. Thanks!

@oppiabot oppiabot bot added the PR: LGTM label Jan 21, 2023
@oppiabot
Copy link

oppiabot bot commented Jan 21, 2023

Hi @BenHenning, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks!

@oppiabot
Copy link

oppiabot bot commented Jan 28, 2023

Hi @BenHenning, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 28, 2023
Also, bump version codes to prepare for another Kenya-specific alpha
re-release.
@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 30, 2023
Copy link
Member Author

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a self-review pass on the changes. I'll need to explain the changes in the main comment, as well, before this PR can be re-reviewed and merged.

@oppiabot
Copy link

oppiabot bot commented Feb 8, 2023

Hi @BenHenning, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Feb 8, 2023
@oppiabot oppiabot bot closed this Feb 15, 2023
@BenHenning BenHenning reopened this Feb 17, 2023
@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Feb 17, 2023
@oppiabot
Copy link

oppiabot bot commented Feb 24, 2023

Hi @BenHenning, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Feb 24, 2023
Also, fix the version code ordering for KitKat/Lollipop versions
(Lollipop should always take priority).
@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Feb 28, 2023
@oppiabot
Copy link

oppiabot bot commented Mar 8, 2023

Hi @BenHenning, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 8, 2023
@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 10, 2023
@BenHenning BenHenning requested a review from seanlip March 10, 2023 06:53
@BenHenning
Copy link
Member Author

@seanlip PTAL for latest changes & PR description updates. I've also self-reviewed the latest changes, so I think this PR is ready to go if it looks good to you.

@BenHenning BenHenning assigned seanlip and unassigned BenHenning Mar 10, 2023
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No concerns on my end, thanks @BenHenning.

@seanlip seanlip assigned BenHenning and unassigned seanlip Mar 10, 2023
@seanlip seanlip merged commit a541783 into develop Mar 10, 2023
@seanlip seanlip deleted the adjust-version-codes-based-on-flavors branch March 10, 2023 07:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump version codes for upcoming alpha releases, plus fix their order
2 participants