mirror of
https://github.com/github/codeql.git
synced 2025-12-16 16:53:25 +01:00
Ruby: Change how we pull in shared/tree-sitter-extractor dependency
Previously, we pulled in the shared tree-sitter extractor via a `git` dependency in `Cargo.toml` to address a `rules_rust` limitation (no `path` dependencies outside of the cargo workspace)). This was a problem, as that means we're cloning `github/codeql` _again_ for the build, which is quite slow. I found another way that is faster, and still produces correct builds for both `cargo`` and `rules_rust`: * Cargo depends on a fake crate that has the same dependencies as the real crate (thanks to `sync-files.py`). Therefore, cargo pulls in the right dependencies into the lockfile, which bazel targets * For local builds, we override the path to that dependency in a cargo config, so we're pulling in the correct code * rules_rust only uses `path` dependencies for collecting transitive dependencies, it never pulls in the code from there. So far that, we manually provide a `BUILD.bazel` file for the shared extractor, and depend on that.
This commit is contained in:
Cornelius Riemenschneider
@@ -364,5 +364,9 @@
|
||||
"Python model summaries test extension": [
|
||||
"python/ql/test/library-tests/dataflow/model-summaries/InlineTaintTest.ext.yml",
|
||||
"python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ext.yml"
|
||||
],
|
||||
"shared tree-sitter extractor cargo.toml": [
|
||||
"shared/tree-sitter-extractor/Cargo.toml",
|
||||
"ruby/extractor/codeql-extractor-fake-crate/Cargo.toml"
|
||||
]
|
||||
}
|
||||
|
||||
1
ruby/extractor/.cargo/config.toml
Normal file
1
ruby/extractor/.cargo/config.toml
Normal file
@@ -0,0 +1 @@
|
||||
paths = ["../../shared/tree-sitter-extractor"]
|
||||
@@ -11,5 +11,7 @@ codeql_rust_binary(
|
||||
visibility = ["//visibility:public"],
|
||||
deps = all_crate_deps(
|
||||
normal = True,
|
||||
),
|
||||
) + [
|
||||
"//shared/tree-sitter-extractor:codeql-extractor",
|
||||
],
|
||||
)
|
||||
|
||||
BIN
ruby/extractor/Cargo.lock
generated
BIN
ruby/extractor/Cargo.lock
generated
Binary file not shown.
@@ -1,3 +1,4 @@
|
||||
[workspace]
|
||||
[package]
|
||||
name = "codeql-extractor-ruby"
|
||||
description = "CodeQL Ruby extractor"
|
||||
@@ -27,14 +28,8 @@ encoding = "0.2"
|
||||
lazy_static = "1.4.0"
|
||||
# Ideally, we'd like to pull this in via a relative path.
|
||||
# However, our bazel/rust tooling chokes on this, c.f. https://github.com/bazelbuild/rules_rust/issues/1525
|
||||
# Therefore, to break that dependency, we depend on it via a git dependency instead.
|
||||
# We should change this back to a path dependency once this issue is fixed.
|
||||
# We can't depend on this without a rev/branch specification, as the rules_rust code assumes the default branch
|
||||
# is called `master`, and if we pull this in with `branch=main`, then `cargo` works (and pins this at th current git SHA
|
||||
# of lock-file update time, but `rules_rust` pins generates a bazel rule that unconditionally downloads `main`, which
|
||||
# breaks build hermeticity. So, rev-pinning it is.
|
||||
# See also https://github.com/bazelbuild/rules_rust/issues/2502.
|
||||
codeql-extractor = { git = "https://github.com/github/codeql.git", rev = "0dbce3d077f6f31a8d660aea104ee31cacf6bacd" }
|
||||
# Therefore, we have a pretty bad hack in place instead, see README.md in the codeql-extractor-fake-crate directory.
|
||||
codeql-extractor = { path = "codeql-extractor-fake-crate" }
|
||||
|
||||
[patch.crates-io]
|
||||
tree-sitter = {git = "https://github.com/redsun82/tree-sitter.git", rev = "1f5c1112ceaa8fc6aff61d1852690407670d2a96"}
|
||||
tree-sitter = { git = "https://github.com/redsun82/tree-sitter.git", rev = "1f5c1112ceaa8fc6aff61d1852690407670d2a96" }
|
||||
|
||||
553
ruby/extractor/cargo-bazel-lock.json
generated
553
ruby/extractor/cargo-bazel-lock.json
generated
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"checksum": "93d0053faf939037ac2cd61edfa1ee0f5d5918cb9e1773a0e0574fcbc13325c3",
|
||||
"checksum": "bf577b30a6fa1893707e2384a92d21f3d271344127cb80069a477cb5308a6c64",
|
||||
"crates": {
|
||||
"adler 1.0.2": {
|
||||
"name": "adler",
|
||||
@@ -927,7 +927,7 @@
|
||||
"target": "quote"
|
||||
},
|
||||
{
|
||||
"id": "syn 2.0.65",
|
||||
"id": "syn 2.0.66",
|
||||
"target": "syn"
|
||||
}
|
||||
],
|
||||
@@ -983,15 +983,7 @@
|
||||
"name": "codeql-extractor",
|
||||
"version": "0.2.0",
|
||||
"package_url": null,
|
||||
"repository": {
|
||||
"Git": {
|
||||
"remote": "https://github.com/github/codeql.git",
|
||||
"commitish": {
|
||||
"Rev": "0dbce3d077f6f31a8d660aea104ee31cacf6bacd"
|
||||
},
|
||||
"strip_prefix": "shared/tree-sitter-extractor"
|
||||
}
|
||||
},
|
||||
"repository": null,
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
@@ -1065,6 +1057,23 @@
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"deps_dev": {
|
||||
"common": [
|
||||
{
|
||||
"id": "rand 0.8.5",
|
||||
"target": "rand"
|
||||
},
|
||||
{
|
||||
"id": "tree-sitter-json 0.21.0",
|
||||
"target": "tree_sitter_json"
|
||||
},
|
||||
{
|
||||
"id": "tree-sitter-ql 0.22.5",
|
||||
"target": "tree_sitter_ql"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"edition": "2021",
|
||||
"version": "0.2.0"
|
||||
},
|
||||
@@ -1089,10 +1098,6 @@
|
||||
"id": "clap 4.5.4",
|
||||
"target": "clap"
|
||||
},
|
||||
{
|
||||
"id": "codeql-extractor 0.2.0",
|
||||
"target": "codeql_extractor"
|
||||
},
|
||||
{
|
||||
"id": "encoding 0.2.33",
|
||||
"target": "encoding"
|
||||
@@ -1853,6 +1858,70 @@
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"getrandom 0.2.15": {
|
||||
"name": "getrandom",
|
||||
"version": "0.2.15",
|
||||
"package_url": "https://github.com/rust-random/getrandom",
|
||||
"repository": {
|
||||
"Http": {
|
||||
"url": "https://static.crates.io/crates/getrandom/0.2.15/download",
|
||||
"sha256": "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
"crate_name": "getrandom",
|
||||
"crate_root": "src/lib.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"library_target_name": "getrandom",
|
||||
"common_attrs": {
|
||||
"compile_data_glob": [
|
||||
"**"
|
||||
],
|
||||
"crate_features": {
|
||||
"common": [
|
||||
"std"
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "cfg-if 1.0.0",
|
||||
"target": "cfg_if"
|
||||
}
|
||||
],
|
||||
"selects": {
|
||||
"cfg(target_os = \"wasi\")": [
|
||||
{
|
||||
"id": "wasi 0.11.0+wasi-snapshot-preview1",
|
||||
"target": "wasi"
|
||||
}
|
||||
],
|
||||
"cfg(unix)": [
|
||||
{
|
||||
"id": "libc 0.2.155",
|
||||
"target": "libc"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"edition": "2018",
|
||||
"version": "0.2.15"
|
||||
},
|
||||
"license": "MIT OR Apache-2.0",
|
||||
"license_ids": [
|
||||
"Apache-2.0",
|
||||
"MIT"
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"globset 0.4.14": {
|
||||
"name": "globset",
|
||||
"version": "0.4.14",
|
||||
@@ -2836,6 +2905,49 @@
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"ppv-lite86 0.2.17": {
|
||||
"name": "ppv-lite86",
|
||||
"version": "0.2.17",
|
||||
"package_url": "https://github.com/cryptocorrosion/cryptocorrosion",
|
||||
"repository": {
|
||||
"Http": {
|
||||
"url": "https://static.crates.io/crates/ppv-lite86/0.2.17/download",
|
||||
"sha256": "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
"crate_name": "ppv_lite86",
|
||||
"crate_root": "src/lib.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"library_target_name": "ppv_lite86",
|
||||
"common_attrs": {
|
||||
"compile_data_glob": [
|
||||
"**"
|
||||
],
|
||||
"crate_features": {
|
||||
"common": [
|
||||
"simd",
|
||||
"std"
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"edition": "2018",
|
||||
"version": "0.2.17"
|
||||
},
|
||||
"license": "MIT/Apache-2.0",
|
||||
"license_ids": [
|
||||
"Apache-2.0",
|
||||
"MIT"
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"proc-macro2 1.0.83": {
|
||||
"name": "proc-macro2",
|
||||
"version": "1.0.83",
|
||||
@@ -2958,6 +3070,182 @@
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"rand 0.8.5": {
|
||||
"name": "rand",
|
||||
"version": "0.8.5",
|
||||
"package_url": "https://github.com/rust-random/rand",
|
||||
"repository": {
|
||||
"Http": {
|
||||
"url": "https://static.crates.io/crates/rand/0.8.5/download",
|
||||
"sha256": "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
"crate_name": "rand",
|
||||
"crate_root": "src/lib.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"library_target_name": "rand",
|
||||
"common_attrs": {
|
||||
"compile_data_glob": [
|
||||
"**"
|
||||
],
|
||||
"crate_features": {
|
||||
"common": [
|
||||
"alloc",
|
||||
"default",
|
||||
"getrandom",
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"std",
|
||||
"std_rng"
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "rand_chacha 0.3.1",
|
||||
"target": "rand_chacha"
|
||||
},
|
||||
{
|
||||
"id": "rand_core 0.6.4",
|
||||
"target": "rand_core"
|
||||
}
|
||||
],
|
||||
"selects": {
|
||||
"cfg(unix)": [
|
||||
{
|
||||
"id": "libc 0.2.155",
|
||||
"target": "libc"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"edition": "2018",
|
||||
"version": "0.8.5"
|
||||
},
|
||||
"license": "MIT OR Apache-2.0",
|
||||
"license_ids": [
|
||||
"Apache-2.0",
|
||||
"MIT"
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"rand_chacha 0.3.1": {
|
||||
"name": "rand_chacha",
|
||||
"version": "0.3.1",
|
||||
"package_url": "https://github.com/rust-random/rand",
|
||||
"repository": {
|
||||
"Http": {
|
||||
"url": "https://static.crates.io/crates/rand_chacha/0.3.1/download",
|
||||
"sha256": "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
"crate_name": "rand_chacha",
|
||||
"crate_root": "src/lib.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"library_target_name": "rand_chacha",
|
||||
"common_attrs": {
|
||||
"compile_data_glob": [
|
||||
"**"
|
||||
],
|
||||
"crate_features": {
|
||||
"common": [
|
||||
"std"
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "ppv-lite86 0.2.17",
|
||||
"target": "ppv_lite86"
|
||||
},
|
||||
{
|
||||
"id": "rand_core 0.6.4",
|
||||
"target": "rand_core"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"edition": "2018",
|
||||
"version": "0.3.1"
|
||||
},
|
||||
"license": "MIT OR Apache-2.0",
|
||||
"license_ids": [
|
||||
"Apache-2.0",
|
||||
"MIT"
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"rand_core 0.6.4": {
|
||||
"name": "rand_core",
|
||||
"version": "0.6.4",
|
||||
"package_url": "https://github.com/rust-random/rand",
|
||||
"repository": {
|
||||
"Http": {
|
||||
"url": "https://static.crates.io/crates/rand_core/0.6.4/download",
|
||||
"sha256": "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
"crate_name": "rand_core",
|
||||
"crate_root": "src/lib.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"library_target_name": "rand_core",
|
||||
"common_attrs": {
|
||||
"compile_data_glob": [
|
||||
"**"
|
||||
],
|
||||
"crate_features": {
|
||||
"common": [
|
||||
"alloc",
|
||||
"getrandom",
|
||||
"std"
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "getrandom 0.2.15",
|
||||
"target": "getrandom"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"edition": "2018",
|
||||
"version": "0.6.4"
|
||||
},
|
||||
"license": "MIT OR Apache-2.0",
|
||||
"license_ids": [
|
||||
"Apache-2.0",
|
||||
"MIT"
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"rayon 1.10.0": {
|
||||
"name": "rayon",
|
||||
"version": "1.10.0",
|
||||
@@ -3546,7 +3834,7 @@
|
||||
"target": "quote"
|
||||
},
|
||||
{
|
||||
"id": "syn 2.0.65",
|
||||
"id": "syn 2.0.66",
|
||||
"target": "syn"
|
||||
}
|
||||
],
|
||||
@@ -3755,14 +4043,14 @@
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"syn 2.0.65": {
|
||||
"syn 2.0.66": {
|
||||
"name": "syn",
|
||||
"version": "2.0.65",
|
||||
"version": "2.0.66",
|
||||
"package_url": "https://github.com/dtolnay/syn",
|
||||
"repository": {
|
||||
"Http": {
|
||||
"url": "https://static.crates.io/crates/syn/2.0.65/download",
|
||||
"sha256": "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
|
||||
"url": "https://static.crates.io/crates/syn/2.0.66/download",
|
||||
"sha256": "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
@@ -3817,7 +4105,7 @@
|
||||
"selects": {}
|
||||
},
|
||||
"edition": "2021",
|
||||
"version": "2.0.65"
|
||||
"version": "2.0.66"
|
||||
},
|
||||
"license": "MIT OR Apache-2.0",
|
||||
"license_ids": [
|
||||
@@ -3978,7 +4266,7 @@
|
||||
"target": "quote"
|
||||
},
|
||||
{
|
||||
"id": "syn 2.0.65",
|
||||
"id": "syn 2.0.66",
|
||||
"target": "syn"
|
||||
}
|
||||
],
|
||||
@@ -4369,6 +4657,170 @@
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"tree-sitter-json 0.21.0": {
|
||||
"name": "tree-sitter-json",
|
||||
"version": "0.21.0",
|
||||
"package_url": "https://github.com/tree-sitter/tree-sitter-json",
|
||||
"repository": {
|
||||
"Git": {
|
||||
"remote": "https://github.com/tree-sitter/tree-sitter-json",
|
||||
"commitish": {
|
||||
"Branch": "master"
|
||||
}
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
"crate_name": "tree_sitter_json",
|
||||
"crate_root": "bindings/rust/lib.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuildScript": {
|
||||
"crate_name": "build_script_build",
|
||||
"crate_root": "bindings/rust/build.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"library_target_name": "tree_sitter_json",
|
||||
"common_attrs": {
|
||||
"compile_data_glob": [
|
||||
"**"
|
||||
],
|
||||
"deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "tree-sitter 0.22.6",
|
||||
"target": "tree_sitter"
|
||||
},
|
||||
{
|
||||
"id": "tree-sitter-json 0.21.0",
|
||||
"target": "build_script_build"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"edition": "2021",
|
||||
"version": "0.21.0"
|
||||
},
|
||||
"build_script_attrs": {
|
||||
"data_glob": [
|
||||
"**"
|
||||
],
|
||||
"deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "cc 1.0.98",
|
||||
"target": "cc"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"link_deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "tree-sitter 0.22.6",
|
||||
"target": "tree_sitter"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
}
|
||||
},
|
||||
"license": "MIT",
|
||||
"license_ids": [
|
||||
"MIT"
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"tree-sitter-ql 0.22.5": {
|
||||
"name": "tree-sitter-ql",
|
||||
"version": "0.22.5",
|
||||
"package_url": "https://github.com/tree-sitter/tree-sitter-ql",
|
||||
"repository": {
|
||||
"Git": {
|
||||
"remote": "https://github.com/tree-sitter/tree-sitter-ql",
|
||||
"commitish": {
|
||||
"Branch": "master"
|
||||
}
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
"crate_name": "tree_sitter_ql",
|
||||
"crate_root": "bindings/rust/lib.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuildScript": {
|
||||
"crate_name": "build_script_build",
|
||||
"crate_root": "bindings/rust/build.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"library_target_name": "tree_sitter_ql",
|
||||
"common_attrs": {
|
||||
"compile_data_glob": [
|
||||
"**"
|
||||
],
|
||||
"deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "tree-sitter 0.22.6",
|
||||
"target": "tree_sitter"
|
||||
},
|
||||
{
|
||||
"id": "tree-sitter-ql 0.22.5",
|
||||
"target": "build_script_build"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"edition": "2018",
|
||||
"version": "0.22.5"
|
||||
},
|
||||
"build_script_attrs": {
|
||||
"data_glob": [
|
||||
"**"
|
||||
],
|
||||
"deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "cc 1.0.98",
|
||||
"target": "cc"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
},
|
||||
"link_deps": {
|
||||
"common": [
|
||||
{
|
||||
"id": "tree-sitter 0.22.6",
|
||||
"target": "tree_sitter"
|
||||
}
|
||||
],
|
||||
"selects": {}
|
||||
}
|
||||
},
|
||||
"license": "MIT",
|
||||
"license_ids": [
|
||||
"MIT"
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"tree-sitter-ruby 0.21.0": {
|
||||
"name": "tree-sitter-ruby",
|
||||
"version": "0.21.0",
|
||||
@@ -4588,6 +5040,42 @@
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"wasi 0.11.0+wasi-snapshot-preview1": {
|
||||
"name": "wasi",
|
||||
"version": "0.11.0+wasi-snapshot-preview1",
|
||||
"package_url": "https://github.com/bytecodealliance/wasi",
|
||||
"repository": {
|
||||
"Http": {
|
||||
"url": "https://static.crates.io/crates/wasi/0.11.0+wasi-snapshot-preview1/download",
|
||||
"sha256": "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"Library": {
|
||||
"crate_name": "wasi",
|
||||
"crate_root": "src/lib.rs",
|
||||
"srcs": [
|
||||
"**/*.rs"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"library_target_name": "wasi",
|
||||
"common_attrs": {
|
||||
"compile_data_glob": [
|
||||
"**"
|
||||
],
|
||||
"edition": "2018",
|
||||
"version": "0.11.0+wasi-snapshot-preview1"
|
||||
},
|
||||
"license": "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT",
|
||||
"license_ids": [
|
||||
"Apache-2.0",
|
||||
"MIT"
|
||||
],
|
||||
"license_file": null
|
||||
},
|
||||
"wasm-bindgen 0.2.92": {
|
||||
"name": "wasm-bindgen",
|
||||
"version": "0.2.92",
|
||||
@@ -4723,7 +5211,7 @@
|
||||
"target": "quote"
|
||||
},
|
||||
{
|
||||
"id": "syn 2.0.65",
|
||||
"id": "syn 2.0.66",
|
||||
"target": "syn"
|
||||
},
|
||||
{
|
||||
@@ -4841,7 +5329,7 @@
|
||||
"target": "quote"
|
||||
},
|
||||
{
|
||||
"id": "syn 2.0.65",
|
||||
"id": "syn 2.0.66",
|
||||
"target": "syn"
|
||||
},
|
||||
{
|
||||
@@ -5789,6 +6277,7 @@
|
||||
},
|
||||
"binary_crates": [],
|
||||
"workspace_members": {
|
||||
"codeql-extractor 0.2.0": "ruby/extractor/codeql-extractor-fake-crate",
|
||||
"codeql-extractor-ruby 0.1.0": "ruby/extractor"
|
||||
},
|
||||
"conditions": {
|
||||
@@ -5901,6 +6390,9 @@
|
||||
],
|
||||
"cfg(target_os = \"haiku\")": [],
|
||||
"cfg(target_os = \"hermit\")": [],
|
||||
"cfg(target_os = \"wasi\")": [
|
||||
"wasm32-wasi"
|
||||
],
|
||||
"cfg(target_os = \"windows\")": [
|
||||
"aarch64-pc-windows-msvc",
|
||||
"i686-pc-windows-msvc",
|
||||
@@ -6010,17 +6502,26 @@
|
||||
]
|
||||
},
|
||||
"direct_deps": [
|
||||
"chrono 0.4.38",
|
||||
"clap 4.5.4",
|
||||
"codeql-extractor 0.2.0",
|
||||
"encoding 0.2.33",
|
||||
"flate2 1.0.30",
|
||||
"globset 0.4.14",
|
||||
"lazy_static 1.4.0",
|
||||
"num_cpus 1.16.0",
|
||||
"rayon 1.10.0",
|
||||
"regex 1.10.4",
|
||||
"serde 1.0.202",
|
||||
"serde_json 1.0.117",
|
||||
"tracing 0.1.40",
|
||||
"tracing-subscriber 0.3.18",
|
||||
"tree-sitter 0.22.6",
|
||||
"tree-sitter-embedded-template 0.21.0",
|
||||
"tree-sitter-ruby 0.21.0"
|
||||
],
|
||||
"direct_dev_deps": []
|
||||
"direct_dev_deps": [
|
||||
"rand 0.8.5",
|
||||
"tree-sitter-json 0.21.0",
|
||||
"tree-sitter-ql 0.22.5"
|
||||
]
|
||||
}
|
||||
|
||||
28
ruby/extractor/codeql-extractor-fake-crate/Cargo.toml
Normal file
28
ruby/extractor/codeql-extractor-fake-crate/Cargo.toml
Normal file
@@ -0,0 +1,28 @@
|
||||
[package]
|
||||
name = "codeql-extractor"
|
||||
version = "0.2.0"
|
||||
edition = "2021"
|
||||
authors = ["GitHub"]
|
||||
|
||||
[dependencies]
|
||||
flate2 = "1.0"
|
||||
globset = "0.4"
|
||||
tree-sitter = ">= 0.22.6"
|
||||
tracing = "0.1"
|
||||
tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
|
||||
rayon = "1.5.0"
|
||||
regex = "1.7.1"
|
||||
encoding = "0.2"
|
||||
lazy_static = "1.4.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
num_cpus = "1.14.0"
|
||||
|
||||
[dev-dependencies]
|
||||
tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql" }
|
||||
tree-sitter-json = {git = "https://github.com/tree-sitter/tree-sitter-json" }
|
||||
rand = "0.8.5"
|
||||
|
||||
[patch.crates-io]
|
||||
tree-sitter = {git = "https://github.com/redsun82/tree-sitter.git", rev = "1f5c1112ceaa8fc6aff61d1852690407670d2a96"}
|
||||
7
ruby/extractor/codeql-extractor-fake-crate/README.md
Normal file
7
ruby/extractor/codeql-extractor-fake-crate/README.md
Normal file
@@ -0,0 +1,7 @@
|
||||
We're presenting a fake crate in this workspace that ensures that the correct crate dependencies from the shared tree sitter
|
||||
extractor can be parsed by Bazel (which doesn't resolve path dependencies outside of the cargo workspace unfortunately).
|
||||
|
||||
The sync-identical-files script keeps this up-to-date.
|
||||
For local development and IDEs, we override the path to `codeql-extractor` using the `.cargo/config.toml` mechanism.
|
||||
Bazel doesn't actually do anything with path dependencies except to pull in their dependency tree, so we manually
|
||||
specify the dependency from the ruby extractor to the shared extractor in `BUILD.bazel`.
|
||||
1
ruby/extractor/codeql-extractor-fake-crate/src/lib.rs
Normal file
1
ruby/extractor/codeql-extractor-fake-crate/src/lib.rs
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
16
shared/tree-sitter-extractor/BUILD.bazel
Normal file
16
shared/tree-sitter-extractor/BUILD.bazel
Normal file
@@ -0,0 +1,16 @@
|
||||
load("@ruby_deps//:defs.bzl", "aliases", "all_crate_deps")
|
||||
load("@rules_rust//rust:defs.bzl", "rust_library")
|
||||
|
||||
package(default_visibility = ["//visibility:public"])
|
||||
|
||||
rust_library(
|
||||
name = "codeql-extractor",
|
||||
srcs = glob([
|
||||
"src/**/*.rs",
|
||||
]),
|
||||
aliases = aliases(),
|
||||
compile_data = [
|
||||
"src/generator/prefix.dbscheme",
|
||||
],
|
||||
deps = all_crate_deps(package_name = "ruby/extractor/codeql-extractor-fake-crate"),
|
||||
)
|
||||
Reference in New Issue
Block a user