Skip to content

Commit 311c1e1

Browse files
authored
Merge pull request #18829 from smowton/smowton/admin/regularise-extractor-licenses
Regularise extractor pack licenses to all cite the MIT license that covers the whole CodeQL repository
2 parents fe34aa3 + a1ba584 commit 311c1e1

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

actions/extractor/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ codeql_pkg_files(
44
name = "extractor",
55
srcs = [
66
"codeql-extractor.yml",
7+
"//:LICENSE",
78
] + glob(["tools/**"]),
89
strip_prefix = strip_prefix.from_pkg(),
910
visibility = ["//actions:__pkg__"],

javascript/extractor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ The extractor consists of a parser for the latest version of ECMAScript, includi
66

77
## License
88

9-
Like the CodeQL queries, the JavaScript extractor is licensed under [Apache License 2.0](LICENSE) by [GitHub](https://github.com). Some code is derived from other projects, whose licenses are noted in other `LICENSE-*.md` files in this folder.
9+
Like the CodeQL queries, the JavaScript extractor is licensed under the [MIT License](https://github.com/github/codeql/blob/main/LICENSE) by [GitHub](https://github.com). Some code is derived from other projects, whose licenses are noted in other `LICENSE-*.md` files in this folder.

javascript/resources/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ codeql_pkg_files(
88
"tools/*.sh",
99
"BUILD.bazel",
1010
],
11-
),
11+
) + ["//:LICENSE"],
1212
exes = glob(["tools/*.sh"]),
1313
strip_prefix = "",
1414
visibility = ["//javascript:__pkg__"],

python/BUILD.bazel

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ pkg_filegroup(
3131
)
3232

3333
pkg_files(
34-
name = "codeql-extractor-yml",
35-
srcs = ["codeql-extractor.yml"],
34+
name = "resources",
35+
srcs = [
36+
"codeql-extractor.yml",
37+
"//:LICENSE",
38+
],
3639
strip_prefix = None,
3740
)
3841

@@ -47,9 +50,9 @@ codeql_pkg_files(
4750
codeql_pack(
4851
name = "python",
4952
srcs = [
50-
":codeql-extractor-yml",
5153
":dbscheme-group",
5254
":extractor-arch",
55+
":resources",
5356
"//python/downgrades",
5457
"//python/extractor",
5558
"//python/tools",

ruby/BUILD.bazel

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ pkg_filegroup(
3232

3333
codeql_pkg_files(
3434
name = "codeql-extractor-yml",
35-
srcs = ["codeql-extractor.yml"],
35+
srcs = [
36+
"codeql-extractor.yml",
37+
"//:LICENSE",
38+
],
3639
strip_prefix = None,
3740
)
3841

swift/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ codeql_pkg_files(
8282
srcs = [
8383
"codeql-extractor.yml",
8484
"ql/lib/swift.dbscheme.stats",
85+
"//:LICENSE",
8586
"//swift/extractor/trap:generated_dbscheme",
8687
],
8788
)

0 commit comments

Comments
 (0)