Skip to content

Merge release/20.5 after some tooling improvements - #17024

Merged
AliSoftware merged 18 commits into
trunkfrom
release/20.5
Aug 10, 2022
Merged

Merge release/20.5 after some tooling improvements#17024
AliSoftware merged 18 commits into
trunkfrom
release/20.5

Conversation

@AliSoftware

@AliSoftware AliSoftware commented Aug 10, 2022

Copy link
Copy Markdown
Contributor

I recently made a handful of tooling-only PRs to the release/20.5 branch (#17015, #17018, #17019, #17023), which were made in the release branch because those tooling changes would benefit Release Management duties and automation during this beta.

This PR now lands those tooling improvements into trunk:

  • Not only to resync release/20.5 with trunk sooner than later, even if there was no new beta created since
  • But also so that, when it will be time to do a new beta later this sprint, the future release/20.5 -> trunk that will follow would have an easier-to-review diff.

Note All those PRs have already been approved (when then landed in release/20.5), so the review of this PR should be straightforward and trivial — no real need to re-review the already-reviewed changes in practice after all 🙃

 - Ran `fastlane download_translations`
 - Then amended the commits that were done, to discard any updates to the `strings.xml` files (we don't want to pick any new string and translation outside of the regular code-freeze / release cycle), and only keep the changes to the `available_languages.xml` files that the tooling did.
[Tooling] Re-enable Jetpack Lint step on Buildkite
So that the GitHub Release is created once the two betas/final builds (WP+JP) have finished building and the `.aab` files are available
…y versionName and with PlayStore upload disabled"

This reverts commit e174cc1.
…ease-on-ci

[Tooling/CI] Automate creation of GitHub Release after beta/release builds
…ne-typo

[Tooling/CI] Fix typo in pipeline
Now that we don't have `zalpha` anymore
Now that we removed Zalpha flavor
This manual bump of `versionCode=1260` was done so that developers would not experiment installation issues due to us removing the `zalpha` flavor and moving other flavors away from using the `alpha.versionCode` property (which we just deleted) in favor of the `versionCode` property.

Note that, because that change was done manually and without doing a beta to PlayStore alongside it, the `versionCode` updated in this commit does *not* reflect a `versionCode` last used in the PlayStore for the current `versionName`. That is, this commit temporarily make those properties not match the versions last uploaded in the PlayStore anymore (which were `versionCode=1259` for that `versionName=20.5-rc-1`).

This disconnection (with the values actually used for uploaded app bundled to PlayStore) was deemed acceptable though, to ease the transition made by removing the `zalpha` flavor and `alpha.version{Name,Code}` properties — See discussion in #17023 (comment)

This is a transcient state anyway, as the `versionName` and `versionCode` properties will go back to match the values for builds uploaded in PlayStore as soon as we do the next beta or final build.
[Tooling] Remove zalpha flavor and alpha versioning
@AliSoftware AliSoftware self-assigned this Aug 10, 2022
@AliSoftware AliSoftware added this to the 20.6 milestone Aug 10, 2022
@AliSoftware
AliSoftware requested a review from a team August 10, 2022 12:31
@AliSoftware
AliSoftware marked this pull request as ready for review August 10, 2022 12:33
@AliSoftware
AliSoftware enabled auto-merge August 10, 2022 12:36

@ParaskP7 ParaskP7 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM! 💯

I am blindly approving this PR as I reviewed and/or was following closely all those 4 PRs you mentioned there, which are all now part of this bigger PR to be merged to trunk.

@AliSoftware
AliSoftware merged commit 7460bc5 into trunk Aug 10, 2022
@wpmobilebot

Copy link
Copy Markdown
Contributor
You can test the WordPress changes on this Pull Request by downloading an installable build (wordpress-installable-build-pr17024-c2c2ae0.apk), or scanning this QR code:

@wpmobilebot

Copy link
Copy Markdown
Contributor
You can test the Jetpack changes on this Pull Request by downloading an installable build (jetpack-installable-build-pr17024-c2c2ae0.apk), or scanning this QR code:

@AliSoftware AliSoftware changed the title Merge releaes/20.5 after some tooling improvements Merge release/20.5 after some tooling improvements Aug 10, 2022
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.

3 participants