Merge/release 17.6 into develop#14929
Conversation
…rdPress-Android into add/jetpack_ci_lanes
Merge jetpack/release/17.6 into add/jetpack_ci_lanes after 17.6-rc-3
…rdPress-Android into add/jetpack_ci_lanes
Jetpack App: Update infrastructure to support Jetpack app
Leverage prefix used by other notes.
…elease_1.55.2 Integrate gutenberg-mobile release 1.55.2
|
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
|
You can test the changes on this Pull Request by downloading the APK here. |
| "project_name": "WordPress-Android", | ||
| "branch": "trunk", | ||
| "pinned_hash": "92cde8f76c2a77791f8e5164f1e5b287d9cb6f1e", | ||
| "pinned_hash": "08dfbcacef71687eebd0febaf97258e4f708ea54", |
There was a problem hiding this comment.
Points to the new google-services.json with the correct signing fingerprint for Jetpack
| @@ -1,3 +1,22 @@ | |||
| GIT | |||
| remote: git@github.com:wordpress-mobile/release-toolkit.git | |||
| revision: 262e6800830abc75c7d9b6817537b4c099588634 | |||
There was a problem hiding this comment.
Pointing to a pending commit for now waiting for wordpress-mobile/release-toolkit#283 to be merged and release.
IMHO it's ok to merge that PR in develop even in that temp state, and update to point to 1.3.1 later once toolkit 1.3.1 gets released (if the release-toolkit new version takes time to land, that is). Better sync with develop sooner than later and regularize the toolkit version on second stage once ready, than wait for everything, because we're kind of in a rush with the #wp-breaking-02 requiring expedite final release of 17.6 sooner than usual.
| // Allow versionName to be overridden with property. e.g. -PversionName=1234 | ||
| if (project.hasProperty("versionName")) { | ||
| versionName project.property("versionName") | ||
| } else { | ||
| versionName "alpha-300" | ||
| } | ||
| versionCode 1064 |
There was a problem hiding this comment.
This comes from #14927: versioning is now handled by the version.properties file – so that it's easier to support app-and-flavor-specific versioning and disinguish Jetpack, WordPress and WordPress Alpha. See below for how the versionName and versionCode are how overriden per variant and not per flavor.
release/17.6first – but if it gets approved we can merge this all at once because that other PR is already included in this one (see below).This PR is intended to merge
release/17.6intodevelopafter doing17.6-rc-4, which includes:Note that:
merge/release-17.6-into-developbranch to fix conflict – which was mainly on theext.gutenbergMobileVersionvalue that is already onv1.56.0-alpha4indevelopwhile it'sv1.55.2in release branch, so kept the one from develop during conflict resolution.fix-version-names-and-codes-per-variantand notrelease/17.6, because that's the branch that was used to do the release (and where the17.6-rc-4tag landed), and we're waiting for [Tooling] Fix version names and codes per variant #14927 to be merged intorelease/17.6first.Ideally once #14927 is merged into
release/17.6, one could rebasemerge/release-17.6-into-developon top ofrelease/17.6for consistency before merging this PR… but in practice we want this to be merged ASAP to be ready for the final release that must happen sooner than usual, and since I'm at my EOD now, it's not worth waiting for me to rebase only on my tomorrow morning before merging, better get this land ASAP. It should lead to the same end result if we merge this PR as-is (including changes from both PRs at once) anyway.