Skip to content

Merge release/20.6 after 20.6-rc-2 beta #17098

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 8 commits into from
Aug 29, 2022
Merged

Merge release/20.6 after 20.6-rc-2 beta #17098

merged 8 commits into from
Aug 29, 2022

Conversation

AliSoftware
Copy link
Contributor

@AliSoftware AliSoftware commented Aug 29, 2022 •
edited
Loading

Merging the release branch after doing a new beta.

The new beta includes:

  • Integrate gutenberg-mobile release 1.81.1 #17090
    • Doesn't appear in this PR diff though, due to conflict resolution (see below)
  • Latest strings.xml from GlotPress
  • Version bump in version.properties
  • Bonus: Update of the emojis used in our beta/release Buildkite pipelines to make them more identifiable, especially in Slack

Conflicts Resolution

Expected conflict in build.gradle on Gutenberg's version number, given this branch contained a betafix for it

<<<<<<< merge/20.6-rc-2
    wordPressLoginVersion = '0.18.0'
    gutenbergMobileVersion = 'v1.81.1'
=======
    wordPressLoginVersion = 'trunk-692264f8a2a0efa540b7713d3e1ad7fc09b87d47'
    gutenbergMobileVersion = 'v1.82.0-alpha1'
>>>>>>> trunk

Kept trunk's version, as usual, and since it's a higher version anyway. cc @geriux
I'd expect the fix that shipped in 1.81. to either already be part of 1.82.0-alpha1, or to be included in a future 1.82.0-alphaN before the final 1.82.0 anyway.

@AliSoftware AliSoftware added the Releases Label related to managing releases label Aug 29, 2022
@AliSoftware AliSoftware added this to the 20.7 milestone Aug 29, 2022
@AliSoftware AliSoftware self-assigned this Aug 29, 2022
@AliSoftware AliSoftware requested review from a team and geriux August 29, 2022 11:47
@AliSoftware AliSoftware marked this pull request as ready for review August 29, 2022 11:47
AliSoftware
AliSoftware commented Aug 29, 2022
View reviewed changes
.buildkite/beta-builds.yml
- slack: "#build-and-ship"

- label: "🛠 Jetpack Beta Build"
- label: ":jetpack: :android: Beta Build"
Copy link
Contributor Author

@AliSoftware AliSoftware Aug 29, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Since Gio recently added Jetpack as an official emoji supported by Buildkite, I figured it was a great occasion to use it here to make the steps more readable:
image

The main reason I did that change though was to make them more easily identifiable on the build notification in Slack (compared to previously where many other notifications used the same 🛠️ emoji and it was not as easy to know which app this was about just at a quick glance):
image

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Aug 29, 2022 •
edited
Loading

You can test the WordPress changes on this Pull Request by downloading an installable build (wordpress-installable-build-pr17098-c567b2a.apk), or scanning this QR code:

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Aug 29, 2022 •
edited
Loading

You can test the Jetpack changes on this Pull Request by downloading an installable build (jetpack-installable-build-pr17098-c567b2a.apk), or scanning this QR code:

@AliSoftware AliSoftware enabled auto-merge August 29, 2022 12:03
@AliSoftware AliSoftware merged commit e759375 into trunk Aug 29, 2022
oguzkocer
oguzkocer approved these changes Aug 29, 2022
View reviewed changes
Copy link
Contributor

@oguzkocer oguzkocer left a comment

Choose a reason for hiding this comment

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

I am not entirely sure why wordPressLoginVersion was included in the merge conflict. The version change to 0.18.0 was merged in code freeze PR. It should no longer create a conflict since its value hasn't changed in the release/20.6 branch after the code freeze PR.

In any case, the conflict resolution and everything else looks good to me, so :shipit:

@AliSoftware AliSoftware deleted the merge/20.6-rc-2 branch August 29, 2022 17:35
@AliSoftware
Copy link
Contributor Author

AliSoftware commented Aug 29, 2022 •
edited
Loading

I am not entirely sure why wordPressLoginVersion was included in the merge conflict. The version change to 0.18.0 was merged in code freeze PR. It should no longer create a conflict since its value hasn't changed in the release/20.6 branch after the code freeze PR.

Good eye and good question.

The wordpressLoginVersion that appears in the conflict have WPAndroid's trunk pointing to WPLogin 692264f8a2a0efa540b7713d3e1ad7fc09b87d47, which is a commit resulting from this Login PR which was merged on top of / after WPLogin 0.18.0, and pointed to it on WPAndroid's trunk after the code freeze. So this is not the WPLogin commit that we had before we did the code freeze and switched to 0.18.0, but it's a different WPLogin commit which landed afterwards.

That is why there was a conflict on this one there too, as indeed release/20.6 was still pointing on 0.18.0 but trunk is now pointing on a more recent version of WPLogin (enabling self-hosted login for JP which is likely a feature the team is working on in trunk to land it for 20.7). Which is also why that's what we wanted to keep from this conflict resolution on this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oguzkocer oguzkocer oguzkocer approved these changes

@geriux geriux Awaiting requested review from geriux

Assignees

@AliSoftware AliSoftware

Labels

Releases Label related to managing releases

Projects

None yet

Milestone

20.7

Development

Successfully merging this pull request may close these issues.

4 participants

@AliSoftware @wpmobilebot @oguzkocer @dcalhoun