Skip to content
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.

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

Fixes Brave Ads Purchase Intent segments should fall back to parent segments - 1.14.x #6512

Merged
merged 1 commit into from
Sep 3, 2020

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Aug 26, 2020

Uplift of #6483
Resolves brave/brave-browser#11410

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@tmancey tmancey added this to the 1.14.x - Beta milestone Aug 26, 2020
@tmancey tmancey requested a review from a team August 26, 2020 11:10
@tmancey tmancey self-assigned this Aug 26, 2020
@kjozwiak
Copy link
Member

Restarting both Android & Win x64 as both timed out and never finished.

@kjozwiak
Copy link
Member

test-browser failed on Win x64 due to GreaselionServiceTest.ScriptInjectionWithPrecondition failing as per https://ci.brave.com/job/pr-brave-browser-issues-11410-1.14.x-windows/2/execution/node/216/log/. However, this a known intermittent issue and doesn't block uplift.

18:48:41  [  FAILED  ] GreaselionServiceTest.ScriptInjectionWithPrecondition, where TypeParam =  and GetParam() =  (2812 ms)
18:48:41  
18:48:41  [606/606] GreaselionServiceTest.ScriptInjectionWithPrecondition (2986 ms)

18:48:41  1 test failed:
18:48:41      GreaselionServiceTest.ScriptInjectionWithPrecondition (../../brave/browser/greaselion/greaselion_browsertest.cc:265)

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.14.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #6483 (comment).

@kjozwiak kjozwiak merged commit ebe2157 into 1.14.x Sep 3, 2020
@kjozwiak kjozwiak deleted the issues/11410-1.14.x branch September 3, 2020 06:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants