Skip to content

Merge/release 17.6 into develop#14929

Merged
oguzkocer merged 92 commits into
developfrom
merge/release-17.6-into-develop
Jun 24, 2021
Merged

Merge/release 17.6 into develop#14929
oguzkocer merged 92 commits into
developfrom
merge/release-17.6-into-develop

Conversation

@AliSoftware
Copy link
Copy Markdown
Contributor

@AliSoftware AliSoftware commented Jun 24, 2021

⚠️ This ideally requires #14927 to be merged into release/17.6 first – 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.6 into develop after doing 17.6-rc-4, which includes:

Note that:

  • This uses an internediate merge/release-17.6-into-develop branch to fix conflict – which was mainly on the ext.gutenbergMobileVersion value that is already on v1.56.0-alpha4 in develop while it's v1.55.2 in release branch, so kept the one from develop during conflict resolution.
  • But that branch in fact got cut from fix-version-names-and-codes-per-variant and not release/17.6, because that's the branch that was used to do the release (and where the 17.6-rc-4 tag landed), and we're waiting for [Tooling] Fix version names and codes per variant #14927 to be merged into release/17.6 first.

Ideally once #14927 is merged into release/17.6, one could rebase merge/release-17.6-into-develop on top of release/17.6 for 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.

                                    17.6-rc-4     ┌───────────────────────────────────────┐
                                  ○──○──●─────◇   │fix-version-names-and-codes-per-variant│
                                 ╱             ╲  └───────────────────────────────────────┘
                                ╱         ╲     ╲
                               ╱                 ╲
                              ╱             ╲     ╲
╔══════════════╗             ╱            #14927   ╲
║ release/17.6 ║    ○ ─ ─○──○─────────────────◌ ─ ─ ╲ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─▶
╚══════════════╝   ╱                                 ╲
                  ╱                                   ╲     fix
                 ╱                                     ╲  conflict    ┌───────────────────────────────┐
                ╱                                       ○━━━━━━━━━━━○ │merge/release-17.6-into-develop│
               ╱                                       ╱              └───────────────────────────────┘
              ╱                                       ╱               ╲
 ╔═══════╗   ╱                                       ╱                  this PR
 ║develop║──○──────○───○───○───────○────────────────○───────────────────◌────▶
 ╚═══════╝

@AliSoftware AliSoftware requested a review from a team June 24, 2021 16:52
@AliSoftware AliSoftware self-assigned this Jun 24, 2021
@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile Bot commented Jun 24, 2021

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile Bot commented Jun 24, 2021

You can test the changes on this Pull Request by downloading the APK here.

Comment thread .configure
"project_name": "WordPress-Android",
"branch": "trunk",
"pinned_hash": "92cde8f76c2a77791f8e5164f1e5b287d9cb6f1e",
"pinned_hash": "08dfbcacef71687eebd0febaf97258e4f708ea54",
Copy link
Copy Markdown
Contributor Author

@AliSoftware AliSoftware Jun 24, 2021

Choose a reason for hiding this comment

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

Points to the new google-services.json with the correct signing fingerprint for Jetpack

Comment thread Gemfile.lock
@@ -1,3 +1,22 @@
GIT
remote: git@github.com:wordpress-mobile/release-toolkit.git
revision: 262e6800830abc75c7d9b6817537b4c099588634
Copy link
Copy Markdown
Contributor Author

@AliSoftware AliSoftware Jun 24, 2021

Choose a reason for hiding this comment

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

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.

Comment thread WordPress/build.gradle
Comment on lines -85 to -91
// 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
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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.

@AliSoftware AliSoftware marked this pull request as ready for review June 24, 2021 18:49
@oguzkocer oguzkocer merged commit 10383d3 into develop Jun 24, 2021
@oguzkocer oguzkocer deleted the merge/release-17.6-into-develop branch June 24, 2021 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants