-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
chore(deps): Add 3rd party license file and CI checks #17344
Changes from 3 commits
06e4970
841659f
4ed9041
c80773c
65d42fb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
[overrides] | ||
"backon" = { origin = "https://github.com/Xuanwo/backon" } | ||
"bollard-stubs" = { origin = "https://github.com/fussybeaver/bollard" } | ||
"openssl-macros" = { origin = "https://github.com/sfackler/rust-openssl" } | ||
"serde_nanos" = { origin = "https://github.com/caspervonb/serde_nanos" } | ||
Comment on lines
+2
to
+5
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why are these needed? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The sources don't actually include either a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Worth PRing these few upstream to reduce the manual work here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, probably. |
||
|
||
# These can go away once Vector starts using a release of the VRL crate with a | ||
# library field set up. | ||
"vrl" = { license = "MPL-2.0" } | ||
"vrl-compiler" = { license = "MPL-2.0" } | ||
"vrl-core" = { license = "MPL-2.0" } | ||
"vrl-diagnostic" = { license = "MPL-2.0" } | ||
"vrl-parser" = { license = "MPL-2.0" } | ||
"vrl-tests" = { license = "MPL-2.0" } | ||
|
||
# `ring` has a custom license that is mostly "ISC-style" but parts of it also fall under OpenSSL licensing. | ||
"ring-0.16.20" = { license = "ISC AND Custom" } | ||
|
||
# `rustls-webpki` doesn't specify their license in the metadata, but the file contains the ISC terms. | ||
"rustls-webpki-0.100.1" = { license = "ISC" } | ||
|
||
# `webpki` doesn't specify their license in the metadata, but the file contains the ISC terms. | ||
"webpki-0.21.4" = { license = "ISC" } | ||
"webpki-0.22.0" = { license = "ISC" } | ||
|
||
# `zerocopy` et al don't specify their licenses in the metadata, but the file contains the 2-clause BSD terms. | ||
"zerocopy-0.6.1" = { license = "BSD-2-Clause" } | ||
"zerocopy-derive-0.3.2" = { license = "BSD-2-Clause" } |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
use anyhow::Result; | ||
|
||
use crate::app; | ||
|
||
/// Rebuild the 3rd-party license file. | ||
#[derive(clap::Args, Debug)] | ||
#[command()] | ||
pub struct Cli {} | ||
|
||
impl Cli { | ||
pub fn exec(self) -> Result<()> { | ||
app::exec("rust-license-tool", ["write"], true) | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
use anyhow::Result; | ||
|
||
use crate::app; | ||
|
||
/// Check that the 3rd-party license file is up to date | ||
#[derive(clap::Args, Debug)] | ||
#[command()] | ||
pub struct Cli {} | ||
|
||
impl Cli { | ||
pub fn exec(self) -> Result<()> { | ||
app::exec("rust-license-tool", ["check"], true) | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Usually we have this installation in the bootstrap file. Would it make sense to put this there?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could go either way. It's only needed for this one check, so 🤷🏻
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True, though the bootstrap scripts are also run as part of
make environment
which installs needed development tools.