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

Fixes blank panel (uplift to 0.69.x) #3204

Merged
merged 1 commit into from
Aug 21, 2019
Merged

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Aug 19, 2019

Uplift of #3201

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.

@kjozwiak
Copy link
Member

kjozwiak commented Aug 20, 2019

@NejcZdovc mind taking a look at https://staging.ci.brave.com/job/brave-browser-build-pr/job/pr3201_blank-panel_0.69.x/1/execution/node/454/log/. Looks like it failed on Win x64 via the following errors:

14:31:04  In file included from ../../brave/components/greaselion/browser/greaselion_download_service.cc:20:
14:31:04  ../..\brave/browser/brave_browser_process_impl.h(11,10): fatal error: 'brave/browser/tor/buildflags.h' file not found
14:31:04  #include "brave/browser/tor/buildflags.h"
14:31:04           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
14:31:04  1 error generated.
14:31:04  [32706/38065] CXX obj/apps/apps/app_restore_service.obj
14:31:04  
08:31:04  ../../brave/components/brave_sync/client/brave_sync_client_impl.cc(18,10): fatal error: 'brave/common/extensions/api/brave_sync.h' file not found
08:31:04  #include "brave/common/extensions/api/brave_sync.h"
08:31:04           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
08:31:04  1 error generated.
08:31:04  [32709/38065] CXX obj/apps/apps/saved_files_service.obj
08:31:15  ninja: build stopped: subcommand failed.
08:31:15  null
08:31:16  powershell.exe : null
08:31:16  At C:\jenkins\workspace\ild-pr_pr3201_blank-panel_0.69.x@tmp\durable-2cfcd2e0\powershellWrapper.ps1:3 char:1
08:31:16  + & powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -Comm ...
08:31:16  + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
08:31:16      + CategoryInfo          : NotSpecified: (null:String) [], RemoteException
08:31:16      + FullyQualifiedErrorId : NativeCommandError

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.69.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are added and the appropriate issue is moved into the correct milestone.

@NejcZdovc NejcZdovc merged commit cbd1300 into 0.69.x Aug 21, 2019
@NejcZdovc NejcZdovc deleted the pr3201_blank-panel_0.69.x branch August 21, 2019 16:44
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