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

Change canvas maximum farbling to match balanced farbling (uplift to 1.13.x) #6335

Merged
merged 1 commit into from
Aug 5, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Aug 4, 2020

Uplift of #6324
Resolves brave/brave-browser#11067

Approved, please ensure that before merging:

  • 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.

@brave-builds brave-builds requested a review from bridiver as a code owner August 4, 2020 17:40
@brave-builds brave-builds requested a review from a team August 4, 2020 17:40
@brave-builds brave-builds self-assigned this Aug 4, 2020
@brave-builds brave-builds added this to the 1.13.x - Beta milestone Aug 4, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Aug 5, 2020

test-browser failed on Linux due to RewardsBrowserTest.NotVerifiedWallet as per https://ci.brave.com/job/pr-brave-browser-pr6324_mpilgrim_canvas_max_1.13.x/1/execution/node/394/log/. However, it doesn't block uplift as it's a known intermittent issue.

14:29:12  Stack trace:
14:29:12  #0 0x56102ad90349 (/home/ubuntu/jenkins/workspace/pr-brave-browser-pr6324_mpilgrim_canvas_max_1.13.x/src/out/Release/brave_browser_tests+0x5c41348)
14:29:12  
14:29:12  [  FAILED  ] RewardsBrowserTest.NotVerifiedWallet, where TypeParam =  and GetParam() =  (1616 ms)
14:29:12  [606/606] RewardsBrowserTest.NotVerifiedWallet (1830 ms)
14:29:12  1 test failed:
14:29:12      RewardsBrowserTest.NotVerifiedWallet (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:241)

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.13.x approved after deliberating with @brave/uplift-approvers. QA has also verified the PR on Nightly as per #6324 (comment).

@kjozwiak kjozwiak merged commit 4b58b30 into 1.13.x Aug 5, 2020
@kjozwiak kjozwiak deleted the pr6324_mpilgrim_canvas_max_1.13.x branch August 5, 2020 04:37
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.

3 participants