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

Adds uphold equities card (uplift to 1.17.x) #6961

Merged
merged 2 commits into from
Oct 30, 2020

Conversation

brave-builds
Copy link
Collaborator

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

Uplift of #6951
Uplift of #6982
Resolves brave/brave-browser#12276
Resolves brave/brave-browser#12372

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 as a code owner October 27, 2020 16:48
@brave-builds brave-builds requested review from emerick, NejcZdovc and a team and removed request for a team October 27, 2020 16:48
@brave-builds brave-builds self-assigned this Oct 27, 2020
@brave-builds brave-builds added this to the 1.17.x - Beta milestone Oct 27, 2020
@kjozwiak
Copy link
Member

@NejcZdovc you'll need to rebase now that #6963 landed in 1.17.x & 1.16.x via #6971 & #6970.

@NejcZdovc NejcZdovc force-pushed the pr6951_uphold-equities_1.17.x branch from 40eb89f to c2e4c06 Compare October 28, 2020 06:01
@NejcZdovc
Copy link
Contributor

@kjozwiak done

@kjozwiak
Copy link
Member

Restarting Win x64 via https://ci.brave.com/job/pr-brave-browser-pr6951_uphold-equities_1.17.x-windows/3/ as it looks like CI ran into an issue with the instance as per https://ci.brave.com/job/pr-brave-browser-pr6951_uphold-equities_1.17.x-windows/2/console.

02:06:43  Still waiting to schedule task
02:06:43  There are no nodes with the label ‘i-055e9ed0ef74c8cb6’
02:08:01  i-055e9ed0ef74c8cb6-windows-swarm-dcf67b48 was marked offline: Connection was broken: java.nio.channels.ClosedChannelException

@kjozwiak
Copy link
Member

Restarting Win x64 via https://ci.brave.com/job/pr-brave-browser-pr6951_uphold-equities_1.17.x-windows/5/ due to Agent Removed as per https://ci.brave.com/job/pr-brave-browser-pr6951_uphold-equities_1.17.x-windows/4/execution/node/189/log/.

13:02:03  Cannot contact i-055e9ed0ef74c8cb6-windows-swarm-dcf67b48: hudson.remoting.RequestAbortedException: java.nio.channels.ClosedChannelException
13:07:03  Could not connect to i-055e9ed0ef74c8cb6-windows-swarm-dcf67b48 to send interrupt signal to process

Linux failed test-browser due to AdBlockServiceTest.SubFrame failing as per https://ci.brave.com/job/pr-brave-browser-pr6951_uphold-equities_1.17.x-linux/3/execution/node/249/log/. However, this is a known intermittent issue that both @NejcZdovc and @jumde have also ran into.

12:58:48  1 test failed:
12:58:48      AdBlockServiceTest.SubFrame (../../brave/browser/brave_shields/ad_block_service_browsertest.cc:527)

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

@kjozwiak kjozwiak merged commit d13badb into 1.17.x Oct 30, 2020
@kjozwiak kjozwiak deleted the pr6951_uphold-equities_1.17.x branch October 30, 2020 03:45
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.

4 participants