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.

Sign up for GitHub

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

Jump to bottom

Adding Bitcoin.com widget to NTP [1.16] #6745

Merged
merged 4 commits into from
Oct 5, 2020
Merged

Adding Bitcoin.com widget to NTP [1.16] #6745

merged 4 commits into from
Oct 5, 2020

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Oct 1, 2020 •
edited by kjozwiak
Loading

Uplift of: #6681, #6747, #6756, #6754
Issue: brave/brave-browser#11982

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.

@ryanml ryanml added this to the 1.16.x - Beta milestone Oct 1, 2020
@ryanml ryanml requested a review from a team October 1, 2020 07:53
@ryanml ryanml requested a review from bridiver as a code owner October 1, 2020 07:53
@ryanml ryanml self-assigned this Oct 1, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Oct 2, 2020

Restarting Win x64 via https://ci.brave.com/job/pr-brave-browser-bitcoin.com-1.16-windows/3/ due to build failing as per https://ci.brave.com/job/pr-brave-browser-bitcoin.com-1.16-windows/2/execution/node/187/log/.

02:03:04  FAILED: obj/brave/browser/extensions/extensions/brave_prefs_util.obj

Restarting Linux via https://ci.brave.com/job/pr-brave-browser-bitcoin.com-1.16-linux/3/ due to build failing as per https://ci.brave.com/job/pr-brave-browser-bitcoin.com-1.16-linux/2/execution/node/205/log/.

01:54:59  FAILED: obj/brave/browser/extensions/extensions/brave_prefs_util.o

Restarting macOS via https://ci.brave.com/job/pr-brave-browser-bitcoin.com-1.16-macos/3/ using WIPE_WORKSPACE due to init failing as per https://ci.brave.com/job/pr-brave-browser-bitcoin.com-1.16-macos/2/execution/node/104/log/.

01:40:05  Error: Command 'vpython src/third_party/depot_tools/download_from_google_storage.py --no_resume --directory --recursive --no_auth --num_threads=16 --bucket chromium-apache-mac src/third_party/apache-mac' returned non-zero exit status 1 in /Users/jenkins/jenkins/workspace/pr-brave-browser-bitcoin.com-1.16-macos

@kjozwiak
Copy link
Member

kjozwiak commented Oct 2, 2020 •
edited
Loading

@ryanml looks like Linux, Win & macOS failed again after the rebase with the same error mentioned via #6745 (comment)

Example:

14:20:26  FAILED: obj/brave/browser/extensions/extensions/brave_prefs_util.o

ryanml and others added 3 commits October 2, 2020 20:41
@ryanml
Merge pull request #6681 from brave/ntp-update-bdc
e4afd78 
NTP Update
@mihaiplesa @ryanml
Merge pull request #6747 from brave/fix-11946
15902eb 
Removes ref to non-existent flag 'ntp_widget_utils_enabled'
@ryanml
Merge pull request #6754 from brave/fix-11959
b9cd28f 
Ensures both bitcoin.com dropdowns aren't open at the same time
@ryanml ryanml added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Oct 3, 2020
@ryanml
Merge pull request #6756 from brave/fix-11958
d93a1c2 
Fixes breaking amount input field on Windows and Linux
@ryanml
Copy link
Contributor Author

ryanml commented Oct 3, 2020

All platforms pass, restarting MacOS due to unrelated failure

@kjozwiak
Copy link
Member

kjozwiak commented Oct 4, 2020

All platforms pass, restarting MacOS due to unrelated failure

Looks like macOS passed 👍 Other platforms passed as well as per the above. Adding links to the other passed platforms to make it easier for @brave/uplift-approvers.

kjozwiak
kjozwiak approved these changes Oct 5, 2020
View reviewed changes
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 also verified the PR on Nightly as per #6681 (comment), #6756 (comment) & #6754 (comment).

@kjozwiak kjozwiak merged commit 6b18930 into 1.16.x Oct 5, 2020
@kjozwiak kjozwiak deleted the bitcoin.com-1.16 branch October 5, 2020 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

@bridiver bridiver Awaiting requested review from bridiver bridiver is a code owner

Assignees

@ryanml ryanml

Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS feature/crypto-widgets
Projects
None yet
Milestone
1.16.x - Release #1
Development

Successfully merging this pull request may close these issues.
3 participants
@ryanml @kjozwiak @mihaiplesa