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

Improve copyright statement (uplift to 0.72.x) #3957

Merged
merged 2 commits into from
Nov 10, 2019

Conversation

fmarier
Copy link
Member

@fmarier fmarier commented Nov 9, 2019

Uplift of #3828

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.

This add a link to the license, build instructions as well as the
corresponding source code.
…rowser#6152)

The version number on the about page should be a link to the page
for the latest release notes.
@fmarier fmarier added this to the 0.72.x - Beta milestone Nov 9, 2019
@fmarier fmarier requested a review from bridiver as a code owner November 9, 2019 04:13
@fmarier fmarier self-assigned this Nov 9, 2019
@kjozwiak
Copy link
Member

kjozwiak commented Nov 9, 2019

Restarting macOS due to the following failure as per https://ci.brave.com/job/brave-browser-build-pr/job/francois-improve-copyright-statement-3828-0.72.x/1/execution/node/767/log/:

05:32:14  FAILED: Brave Browser Nightly.dSYM.tar.bz2 
05:32:14  python ../../chrome/tools/build/mac/archive_symbols.py Brave\ Browser\ Nightly.dSYM.tar.bz2 AlertNotificationService.dSYM Brave\ Browser\ Nightly\ Framework.dSYM Brave\ Browser\ Nightly.dSYM chrome_crashpad_handler.dSYM libswiftshader_libEGL.dylib.dSYM libswiftshader_libGLESv2.dylib.dSYM Brave\ Browser\ Nightly\ Helper.dSYM Brave\ Browser\ Nightly\ Helper\ \(Renderer\).dSYM Brave\ Browser\ Nightly\ Helper\ \(GPU\).dSYM Brave\ Browser\ Nightly\ Helper\ \(Plugin\).dSYM
05:32:14  Traceback (most recent call last):
05:32:14    File "../../chrome/tools/build/mac/archive_symbols.py", line 31, in <module>
05:32:14      sys.exit(Main(sys.argv[1:]))
05:32:14    File "../../chrome/tools/build/mac/archive_symbols.py", line 19, in Main
05:32:14      return subprocess.check_call(['tar', '-cjf'] + args)
05:32:14    File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/subprocess.py", line 540, in check_call
05:32:14      raise CalledProcessError(retcode, cmd)
05:32:14  subprocess.CalledProcessError: Command '['tar', '-cjf', 'Brave Browser Nightly.dSYM.tar.bz2', 'AlertNotificationService.dSYM', 'Brave Browser Nightly Framework.dSYM', 'Brave Browser Nightly.dSYM', 'chrome_crashpad_handler.dSYM', 'libswiftshader_libEGL.dylib.dSYM', 'libswiftshader_libGLESv2.dylib.dSYM', 'Brave Browser Nightly Helper.dSYM', 'Brave Browser Nightly Helper (Renderer).dSYM', 'Brave Browser Nightly Helper (GPU).dSYM', 'Brave Browser Nightly Helper (Plugin).dSYM']' returned non-zero exit status -15
05:32:14  ninja: build stopped: interrupted by user.
05:32:15  script returned exit code 143

@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-linux labels Nov 9, 2019
@kjozwiak
Copy link
Member

Restarting macOS again due to the following failure as per https://ci.brave.com/job/brave-browser-build-pr/job/francois-improve-copyright-statement-3828-0.72.x/3/execution/node/371/log/:

15:01:52  [3981/38642] CXX obj/skia/skia_core_and_effects/SkDCubicToQuads.o
15:01:52  ninja: build stopped: subcommand failed.
15:01:52  null
15:01:52  null
15:01:52  npm ERR! code ELIFECYCLE
15:01:52  npm ERR! errno 1
15:01:52  npm ERR! brave@0.72.122 build: `node ./scripts/commands.js build "Release" "--channel=nightly" "--official_build=true" "--skip_signing"`
15:01:52  npm ERR! Exit status 1
15:01:52  npm ERR! 
15:01:52  npm ERR! Failed at the brave@0.72.122 build script.
15:01:52  npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
15:01:52  
15:01:52  npm ERR! A complete log of this run can be found in:
15:01:52  npm ERR!     /Users/jenkins/.npm/_logs/2019-11-09T20_01_52_296Z-debug.log

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. This fix also uplifted into 0.71.x as per #3958 so we'll need it in the other channels. Both CI/Jenkins and CI/Travis passed after restarting macOS several times.

@kjozwiak kjozwiak merged commit 7ce7ee2 into 0.72.x Nov 10, 2019
@kjozwiak kjozwiak deleted the francois-improve-copyright-statement-3828-0.72.x branch November 10, 2019 07:43
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants