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

Changed help link for connection info (uplift to 1.7.x) #5107

Merged
merged 1 commit into from
Mar 31, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Mar 30, 2020

Uplift of #5095

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 bridiver as a code owner March 30, 2020 21:48
@brave-builds brave-builds self-assigned this Mar 30, 2020
@brave-builds brave-builds added this to the 1.7.x - Beta milestone Mar 30, 2020
@samartnik samartnik added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Mar 30, 2020
@kjozwiak
Copy link
Member

Restarting Android as init failed as per https://ci.brave.com/job/brave-browser-build-pr/job/pr5095_android_changed_help_link_1.7.x/1/execution/node/327/log/

18:07:50  1 failed patches:
18:07:50  chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
18:07:50    - Patch applied because: No corresponding .patchinfo file was found.
18:07:50    - Error - Program git exited with error code 1.
18:07:50  error: patch failed: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java:327
18:07:50  error: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java: patch does not apply
18:07:50  
18:07:50  -------------------------------
18:07:50  Exiting as not all patches were successful!

@kjozwiak
Copy link
Member

Travis is failing TEST_SUITE=test-security due to the minimist npm package being vulnerable. It's a known issue as per brave/brave-browser#8722 and doesn't block the PR from being uplifted.

@samartnik samartnik force-pushed the pr5095_android_changed_help_link_1.7.x branch from 78ac8b6 to a18b445 Compare March 30, 2020 23:40
@kjozwiak
Copy link
Member

Restarting as it looks like build failed as per https://ci.brave.com/job/brave-browser-build-pr/job/pr5095_android_changed_help_link_1.7.x/3/execution/node/360/log/

20:23:01  FAILED: gen/chrome/android/chrome_java.javac.jar gen/chrome/android/chrome_java.javac.jar.info 

@samartnik samartnik force-pushed the pr5095_android_changed_help_link_1.7.x branch from a18b445 to c802c4d Compare March 31, 2020 14:21
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.7.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit e3c9166 into 1.7.x Mar 31, 2020
@kjozwiak kjozwiak deleted the pr5095_android_changed_help_link_1.7.x branch March 31, 2020 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

3 participants