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

Automatically generate LICENSE files for external components (uplift to 1.1.x) #7196

Merged
merged 3 commits into from
Dec 6, 2019
Merged

Automatically generate LICENSE files for external components (uplift to 1.1.x) #7196

merged 3 commits into from
Dec 6, 2019

Conversation

fmarier
Copy link
Member

@fmarier fmarier commented Dec 3, 2019 •
edited
Loading

Uplift of #7155 .

This depends on brave/brave-core#4128 in order to build successfully.

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.

@fmarier fmarier added this to the 1.1.x - Beta milestone Dec 3, 2019
@fmarier fmarier self-assigned this Dec 3, 2019
@fmarier
Automatically generate adblock component LICENSE
7fbd5f7 
The generated LICENSE includes a preamble which clarifies that
these licenses apply to lists which are downloaded at run time and
are separate from the Brave Browser (fixes #7150).
@fmarier
Automatically generate local-data component LICENSE
6c396e8 
The generated LICENSE includes a preamble which clarifies that
these licenses apply to data files which are downloaded at run
time and are separate from the Brave Browser.
@fmarier
Only generate LICENSE files in Release builds
eb29c0f
@fmarier fmarier force-pushed the francois-non-bundled-third-parties-7150-bb-1.1.x branch from c7ede10 to eb29c0f Compare December 5, 2019 00:46
@fmarier fmarier requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv December 5, 2019 00:51
@kjozwiak
Copy link
Member

kjozwiak commented Dec 5, 2019

Should be able to restart/rebuild now that brave/brave-core#4128 has been merged.

kjozwiak
kjozwiak approved these changes Dec 6, 2019
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.1.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any issues. Please make sure that the correct labels are being used and the associated issue(s) are moved into the correct milestone.

@kjozwiak kjozwiak merged commit 7889846 into 1.1.x Dec 6, 2019
@kjozwiak kjozwiak deleted the francois-non-bundled-third-parties-7150-bb-1.1.x branch December 6, 2019 16:44
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

Assignees

@fmarier fmarier

Labels
None yet
Projects
None yet
Milestone
1.1.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@fmarier @kjozwiak