Commit 7350e1a 1 parent 58ba741 commit 7350e1a Copy full SHA for 7350e1a
File tree 9 files changed +687
-2
lines changed
9 files changed +687
-2
lines changed Original file line number Diff line number Diff line change @@ -346,6 +346,9 @@ jobs:
346
346
- name : Check cargo deny advisories/licenses
347
347
if : needs.changes.outputs.dependencies == 'true' || needs.changes.outputs.deny == 'true'
348
348
run : make check-deny
349
+ - name : Check that the 3rd-party license file is up to date
350
+ if : needs.changes.outputs.dependencies == 'true'
351
+ run : make check-licenses
349
352
- name : Check Cue docs
350
353
if : needs.changes.outputs.cue == 'true'
351
354
run : make check-docs
Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change @@ -417,7 +417,7 @@ check: ## Run prerequisite code checks
417
417
check-all : # # Check everything
418
418
check-all : check-fmt check-clippy check-docs
419
419
check-all : check-version check-examples check-component-features
420
- check-all : check-scripts check-deny check-component-docs
420
+ check-all : check-scripts check-deny check-component-docs check-licenses
421
421
422
422
.PHONY : check-component-features
423
423
check-component-features : # # Check that all component features are setup properly
@@ -435,6 +435,10 @@ check-docs: ## Check that all /docs file are valid
435
435
check-fmt : # # Check that all files are formatted properly
436
436
${MAYBE_ENVIRONMENT_EXEC} cargo vdev check fmt
437
437
438
+ .PHONY : check-licenses
439
+ check-licenses : # # Check that the 3rd-party license file is up to date
440
+ ${MAYBE_ENVIRONMENT_EXEC} cargo vdev check licenses
441
+
438
442
.PHONY : check-markdown
439
443
check-markdown : # # Check that markdown is styled properly
440
444
${MAYBE_ENVIRONMENT_EXEC} cargo vdev check markdown
Original file line number Diff line number Diff line change
1
+ [overrides ]
2
+ "backon" = { origin = " https://github.com/Xuanwo/backon" }
3
+ "bollard-stubs" = { origin = " https://github.com/fussybeaver/bollard" }
4
+ "openssl-macros" = { origin = " https://github.com/sfackler/rust-openssl" }
5
+ "serde_nanos" = { origin = " https://github.com/caspervonb/serde_nanos" }
6
+
7
+ # These can go away once Vector starts using a release of the VRL crate with a
8
+ # library field set up.
9
+ "vrl" = { license = " MPL-2.0" }
10
+ "vrl-compiler" = { license = " MPL-2.0" }
11
+ "vrl-core" = { license = " MPL-2.0" }
12
+ "vrl-diagnostic" = { license = " MPL-2.0" }
13
+ "vrl-parser" = { license = " MPL-2.0" }
14
+ "vrl-tests" = { license = " MPL-2.0" }
15
+
16
+ # `ring` has a custom license that is mostly "ISC-style" but parts of it also fall under OpenSSL licensing.
17
+ "ring-0.16.20" = { license = " ISC AND Custom" }
18
+
19
+ # `rustls-webpki` doesn't specify their license in the metadata, but the file contains the ISC terms.
20
+ "rustls-webpki-0.100.1" = { license = " ISC" }
21
+
22
+ # `webpki` doesn't specify their license in the metadata, but the file contains the ISC terms.
23
+ "webpki-0.21.4" = { license = " ISC" }
24
+ "webpki-0.22.0" = { license = " ISC" }
25
+
26
+ # `zerocopy` et al don't specify their licenses in the metadata, but the file contains the 2-clause BSD terms.
27
+ "zerocopy-0.6.1" = { license = " BSD-2-Clause" }
28
+ "zerocopy-derive-0.3.2" = { license = " BSD-2-Clause" }
Original file line number Diff line number Diff line change 17
17
if ! cargo deny --version >& /dev/null ; then
18
18
rustup run stable cargo install cargo-deny --force --locked
19
19
fi
20
+ if ! rust-license-tool --help >& /dev/null ; then
21
+ cargo install --git https://github.com/DataDog/rust-license-tool
22
+ fi
20
23
21
24
cd scripts
22
25
bundle install
Original file line number Diff line number Diff line change
1
+ use anyhow:: Result ;
2
+
3
+ use crate :: app;
4
+
5
+ /// Rebuild the 3rd-party license file.
6
+ #[ derive( clap:: Args , Debug ) ]
7
+ #[ command( ) ]
8
+ pub struct Cli { }
9
+
10
+ impl Cli {
11
+ pub fn exec ( self ) -> Result < ( ) > {
12
+ app:: exec ( "rust-license-tool" , [ "write" ] , true )
13
+ }
14
+ }
Original file line number Diff line number Diff line change 1
1
crate :: cli_subcommands! {
2
2
"Build, generate or regenerate components..."
3
3
component_docs,
4
+ mod licenses,
4
5
manifests,
5
6
mod publish_metadata,
6
7
release_cue,
Original file line number Diff line number Diff line change
1
+ use anyhow:: Result ;
2
+
3
+ use crate :: app;
4
+
5
+ /// Check that the 3rd-party license file is up to date
6
+ #[ derive( clap:: Args , Debug ) ]
7
+ #[ command( ) ]
8
+ pub struct Cli { }
9
+
10
+ impl Cli {
11
+ pub fn exec ( self ) -> Result < ( ) > {
12
+ app:: exec ( "rust-license-tool" , [ "check" ] , true )
13
+ }
14
+ }
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ crate::cli_subcommands! {
7
7
events,
8
8
mod examples,
9
9
mod fmt,
10
+ mod licenses,
10
11
mod markdown,
11
12
mod rust,
12
13
mod scripts,
You can’t perform that action at this time.
0 commit comments