1928239 - Vendor release-v133-desktop 72b039fee61a1f5b7d7290f1c746e83fb02d72f3 into 133

Status: RESOLVED FIXED

(Application Services :: General, task, P1)

Description

[Drew Willcoxon :adw]

Vendor the latest release-v133 branch, 21226212385b407bf0885a691d01ba39e1ee10a4, to 133 so desktop can pick up two commits related to weather suggestions.

Thanks to Donal for helping me with this today.

Comment 1

[Drew Willcoxon :adw]

Attachment: a-s-vendor-release-v133.diff

Approval Request Comment
[Feature/Bug causing the regression]: City-based weather suggestions on desktop (new feature, not a regression)
[User impact if declined]: This is a small fix to weather suggestions on desktop, which we want for 133
[Is this code covered by automated tests?]: Yes
[Has the fix been verified in Nightly?]: No
[Needs manual test from QE? If yes, steps to reproduce]: No
[List of other uplifts needed for the feature/fix]:
[Is the change risky?]: Low risk
[Why is the change risky/not risky?]: The only substantive new commits in this vendoring as compared to what's already been vendored in 133 are two weather-suggestions patches. Weather suggestions are desktop-only and are preffed off by default.
[String changes made/needed]: None

Comment 2

[Drew Willcoxon :adw]

(In reply to Drew Willcoxon :adw from comment #1)

[Why is the change risky/not risky?]: The only substantive new commits in this vendoring as compared to what's already been vendored in 133 are two weather-suggestions patches. Weather suggestions are desktop-only and are preffed off by default.

Uh that's not true. There's a bunch of other stuff in here that shouldn't be. Let me see if I can figure that out.

Comment 3

[Drew Willcoxon :adw]

The release-v133 branch was made on Oct. 25 and has extra commits in it compared to the revision that's currently in 133 that was vendored on Oct. 21. After talking with Donal, the approach taken in the past has been to create a release-vXXX-desktop branch that's branched off the revision in the previous vendor, a0121f35125bd61ebd10fab969f6cfcc02f94d5a in this case. So I created https://github.com/mozilla/application-services/tree/release-v133-desktop, which is branched off a0121f35125bd61ebd10fab969f6cfcc02f94d5a, and cherry picked the two revisions related to weather suggestions.

The vendoring patch I'll attach next is based on that branch.

Comment 4

[Drew Willcoxon :adw]

Attachment: a-s-vendor-release-v133-desktop.diff v2

Approval Request Comment: Please see comment 1

Comment 5

[Drew Willcoxon :adw]

Try looks OK. The "iOS plain" build failed, but it looks like that may be a known intermittent, and this shouldn't have caused it. I restarted it but it's not done yet.

https://treeherder.mozilla.org/jobs?repo=try&revision=c26d23bba1926b6736316534748afcba825793e9

Comment 6

[Donal Meehan [:dmeehan]]

:adw I can't import that patch to beta. Could you please take a look and update the patch?
abort: bad hunk #1 @@ -0,0 +1,251 @@ (3 0 251 251) (check that whitespace in the patch has not been mangled)

Comment 7

[Pulsebot]

https://hg.mozilla.org/releases/mozilla-beta/rev/219029c64896

Comment 8

[Donal Meehan [:dmeehan]]

Comment on attachment 9434397 [details] [diff] [review]
a-s-vendor-release-v133-desktop.diff v2

Approved for 133.0b3