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

Revert "Remove navigator.deviceMemory (part 1)" (uplift to 1.16.x) #6969

Merged
merged 1 commit into from
Oct 29, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Oct 27, 2020

Uplift of #6965 to fix brave/brave-browser#12289.

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 a team October 27, 2020 22:23
@brave-builds brave-builds self-assigned this Oct 27, 2020
@brave-builds brave-builds added this to the 1.16.x - Release #2 milestone Oct 27, 2020
@fmarier fmarier assigned fmarier and unassigned brave-builds Oct 27, 2020
@kjozwiak
Copy link
Member

@fmarier not sure if we're going to be taking this as the issue doesn't seem like it got better on Nightly but just in case, can you rebase the following PR now that #6963 landed in 1.17.x & 1.16.x via #6971 & #6970.

@fmarier fmarier force-pushed the pr6965_francois-recaptcha-12289_1.16.x branch from 3e6e2b4 to 3171a4b Compare October 28, 2020 17:23
@kjozwiak
Copy link
Member

kjozwiak commented Oct 29, 2020

Restarting Win x64 via https://ci.brave.com/job/brave-core-build-pr-windows/job/PR-6969/3/ as our Agent was removed as per https://ci.brave.com/job/pr-brave-browser-pr6965_francois-recaptcha-12289_1.16.x-windows/2/execution/node/189/log/

14:02:05  Cannot contact i-022f52f555dc6c2a4-windows-swarm-2a9a8768: hudson.remoting.RequestAbortedException: java.nio.channels.ClosedChannelException
14:07:05  Could not connect to i-022f52f555dc6c2a4-windows-swarm-2a9a8768 to send interrupt signal to process

Restarting macOS via https://ci.brave.com/job/pr-brave-browser-pr6965_francois-recaptcha-12289_1.16.x-macos/3/ as init and build failed as per https://ci.brave.com/job/pr-brave-browser-pr6965_francois-recaptcha-12289_1.16.x-macos/2/execution/node/213/log/

14:26:28  FAILED: obj/content/browser/browser/browser_main_loop.o 

@kjozwiak
Copy link
Member

macOS failed tets-browser due to RewardsContributionBrowserTest.RecurringAndPartialAutoContribution failing as per https://ci.brave.com/job/pr-brave-browser-pr6965_francois-recaptcha-12289_1.16.x-macos/3/execution/node/249/log. However, the failure is a known intermittent issue and doesn't block uplift.

12:03:33  1 test crashed:
12:03:33      RewardsContributionBrowserTest.RecurringAndPartialAutoContribution (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:620)

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

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.

4 participants