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

API to open Shields and Rewards dialog UI (uplift to 0.71.x) #3872

Merged
merged 2 commits into from
Nov 5, 2019

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Nov 4, 2019

Uplift of #3664
Fixes brave/brave-browser#6419
Fixes brave/brave-browser#6628

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 self-assigned this Nov 4, 2019
@brave-builds brave-builds added this to the 0.71.x - Beta milestone Nov 4, 2019
@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron, NejcZdovc and srirambv November 4, 2019 15:40
Fix master debug build failure from BraveActionAPIDependencyManager
@kjozwiak
Copy link
Member

kjozwiak commented Nov 4, 2019

Restarting on Linux due to the following failure as per https://ci.brave.com/job/brave-browser-build-pr/job/pr3664_trigger-internal-extension-popup_0.71.x/1/execution/node/555/log/:

12:46:40  [10851:10897:1104/174638.703283:ERROR:bus.cc(393)] Failed to connect to the bus: Could not parse server address: Unknown address type (examples of valid types are "tcp" and on UNIX "unix")
12:46:40  Xlib:  extension "XInputExtension" missing on display ":3".
12:46:40  [10851:10897:1104/174638.714221:ERROR:bus.cc(393)] Failed to connect to the bus: Could not parse server address: Unknown address type (examples of valid types are "tcp" and on UNIX "unix")
12:46:40  [10851:10897:1104/174638.714247:ERROR:bus.cc(393)] Failed to connect to the bus: Could not parse server address: Unknown address type (examples of valid types are "tcp" and on UNIX "unix")
12:46:40  [10851:10899:1104/174638.754287:ERROR:rewards_service_impl.cc(198)] Failed to read file: /home/ubuntu/.config/BraveSoftware/brave-network-test/Default/ledger_state
12:46:40  [10910:10910:1104/174638.798181:ERROR:ledger_impl.cc(102)] Failed to initialize wallet
12:47:48  [10851:10851:1104/174738.706569:ERROR:gcm_channel_status_request.cc(145)] GCM channel request failed.
12:48:00  [10851:10851:1104/174759.762208:ERROR:gcm_channel_status_request.cc(145)] GCM channel request failed.
12:48:22  undefined:17841
12:48:22  {"phase":2,"source":{"id":99,"type":8}]}
12:48:22                                        ^
12:48:22  
12:48:22  SyntaxError: Unexpected token ] in JSON at position 78793208
12:48:22      at JSON.parse (<anonymous>)
12:48:22      at start (/home/ubuntu/jenkins/workspace/_internal-extension-popup_0.71.x/lib/start.js:144:23)
12:48:22      at Command.listener (/home/ubuntu/jenkins/workspace/_internal-extension-popup_0.71.x/node_modules/commander/index.js:315:8)
12:48:22      at Command.emit (events.js:210:5)
12:48:22      at Command.parseArgs (/home/ubuntu/jenkins/workspace/_internal-extension-popup_0.71.x/node_modules/commander/index.js:654:12)
12:48:22      at Command.parse (/home/ubuntu/jenkins/workspace/_internal-extension-popup_0.71.x/node_modules/commander/index.js:474:21)
12:48:22      at Object.<anonymous> (/home/ubuntu/jenkins/workspace/_internal-extension-popup_0.71.x/scripts/commands.js:156:4)
12:48:22      at Module._compile (internal/modules/cjs/loader.js:956:30)
12:48:22      at Object.Module._extensions..js (internal/modules/cjs/loader.js:973:10)
12:48:22      at Module.load (internal/modules/cjs/loader.js:812:32)
12:48:22  npm ERR! code ELIFECYCLE

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows labels Nov 4, 2019
@kjozwiak
Copy link
Member

kjozwiak commented Nov 4, 2019

Looks like it failed again due to the following dependency vulnerability as per https://ci.brave.com/job/brave-browser-build-pr/job/pr3664_trigger-internal-extension-popup_0.71.x/2/execution/node/343/log/:

15:49:59                         === npm audit security report ===                        
15:49:59                                                                                  
15:49:59  # Run  npm update handlebars --depth 6  to resolve 1 vulnerability
15:49:59  ┌───────────────┬──────────────────────────────────────────────────────────────┐
15:49:59  │ Moderate      │ Denial of Service                                            │
15:49:59  ├───────────────┼──────────────────────────────────────────────────────────────┤
15:49:59  │ Package       │ handlebars                                                   │
15:49:59  ├───────────────┼──────────────────────────────────────────────────────────────┤
15:49:59  │ Dependency of │ jest [dev]                                                   │
15:49:59  ├───────────────┼──────────────────────────────────────────────────────────────┤
15:49:59  │ Path          │ jest > jest-cli > @jest/core > @jest/reporters >             │
15:49:59  │               │ istanbul-reports > handlebars                                │
15:49:59  ├───────────────┼──────────────────────────────────────────────────────────────┤
15:49:59  │ More info     │ https://npmjs.com/advisories/1300                            │
15:49:59  └───────────────┴──────────────────────────────────────────────────────────────┘

Above issue is addressed via #3878.

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 0.72.x approved after deliberating with @brave/uplift-approvers. CI/Travis passed but CI/Jenkins failed due to the handlebars dependency being vulnerable. However, this has been addressed via #3878.

Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@bsclifton bsclifton merged commit 3fde241 into 0.71.x Nov 5, 2019
@bsclifton bsclifton deleted the pr3664_trigger-internal-extension-popup_0.71.x branch November 5, 2019 04:10
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-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants