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 crash querying database - 1.19.x #7442

Merged
merged 1 commit into from
Dec 17, 2020

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Dec 15, 2020

Uplift of #7314
Resolves brave/brave-browser#12993

  • 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.19.x - Beta milestone Dec 15, 2020
@tmancey tmancey requested a review from a team December 15, 2020 17:43
@tmancey tmancey self-assigned this Dec 15, 2020
@kjozwiak
Copy link
Member

Restarting pre-init via https://ci.brave.com/job/pr-brave-browser-issues-12993-1.19.x-pre-init/2/ as it failed as per https://ci.brave.com/job/pr-brave-browser-issues-12993-1.19.x-pre-init/1/execution/node/74/log/.

test-browser failed on Linux due to SearchEngineProviderP3ATest.DefaultSearchEngineP3A failing as per https://ci.brave.com/job/pr-brave-browser-issues-12993-1.19.x-linux/1/execution/node/202/log/. However, this is a known issue as per brave/brave-browser#13057 and doesn't block uplift.

14:07:04  1 test failed:
14:07:04      SearchEngineProviderP3ATest.DefaultSearchEngineP3A (../../brave/browser/search_engines/search_engine_tracker_browsertest.cc:30)

Restarting iOS via https://ci.brave.com/job/pr-brave-browser-issues-12993-1.19.x-ios/2/ due to build failing as per https://ci.brave.com/job/pr-brave-browser-issues-12993-1.19.x-ios/1/execution/node/138/log/.

13:05:21  FAILED: obj/base/base/json_writer.o 

@tmancey tmancey added CI/skip-android Do not run CI builds for Android CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Dec 16, 2020
@tmancey tmancey force-pushed the issues/12993-1.19.x branch from 46fa31e to 450149d Compare December 16, 2020 19:46
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.19.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #7314 (comment).

@kjozwiak kjozwiak merged commit dc9aac0 into 1.19.x Dec 17, 2020
@kjozwiak kjozwiak deleted the issues/12993-1.19.x branch December 17, 2020 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 feature/ads
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants