artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 16:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Use scip-treesitter binary consistently (#59891)

Browse Source 
Use the same environment variable name everywhere, and make sure
we use the new binary name for tests.
This commit is contained in:
Varun Gandhi 2024-01-26 02:58:11 -06:00 committed by GitHub
parent 4e15aa19aa
commit 21dbf38906
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syntactic-code-intel-worker/shared/config.go
View File

@ -33,7 +33,7 @@ func (c *Config) Load() {
c.WorkerBudget = int64(c.GetInt("SYNTACTIC_CODE_INTEL_WORKER_BUDGET", "0", "The amount of compressed input data (in bytes) a worker can process concurrently. Zero acts as an infinite budget."))
c.MaximumRuntimePerJob = c.GetInterval("SYNTACTIC_CODE_INTEL_WORKER_MAXIMUM_RUNTIME_PER_JOB", "25m", "The maximum time a single repository indexing job can take")
c.CliPath = c.Get("SCIP_TREESITTER_COMMAND", "scip-treesitter", "TODO: fill in description")
c.CliPath = c.Get("SCIP_TREESITTER_PATH", "scip-treesitter", "TODO: fill in description")
c.ListenAddress = c.GetOptional("SYNTACTIC_CODE_INTEL_WORKER_ADDR", "The address under which the syntactic codeintel worker API listens. Can include a port.")
// Fall back to a reasonable default.

4
dev/scip-treesitter-dev
View File

@ -3,14 +3,14 @@
# Wrapper for `scip-treesitter` similar to `dev/scip-ctags-dev`.
#
# To use an alternate scip-treesitter binary for development, invoke
# `SCIP_TREESITTER_COMMAND=path/to/scip-treesitter sg start`.
# `SCIP_TREESITTER_PATH=path/to/scip-treesitter sg start`.
root="$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null
TARGET=$("$root/dev/scip-treesitter-install.sh" which)
if [ ! -f "${TARGET}" ]; then
echo "scip-treesitter is not installed, please run ./dev/scip-treesitter-install.sh"
echo "Alternatively you can use SCIP_TREESITTER_COMMAND=path/to/scip-treesitter to use your own binary."
echo "Alternatively you can use SCIP_TREESITTER_PATH=path/to/scip-treesitter to use your own binary."
exit 1
else
${TARGET} "$@"

2
docker-images/syntax-highlighter/crates/scip-treesitter-cli/BUILD.bazel
View File

@ -78,7 +78,7 @@ rust_test(
env = {
"INSTA_WORKSPACE_ROOT": ".",
"RUST_BACKTRACE": "1",
"SCIP_CLI_LOCATION": "$(rootpath :scip-treesitter)",
"SCIP_TREESITTER_PATH": "$(rootpath :scip-treesitter)",
},
deps = all_crate_deps(
normal = True,

4
docker-images/syntax-highlighter/crates/scip-treesitter-cli/tests/integration_test.rs
View File

@ -10,9 +10,9 @@ use scip_treesitter_cli::io::read_index_from_file;
lazy_static::lazy_static! {
static ref BINARY_LOCATION: PathBuf = {
match std::env::var("SCIP_CLI_LOCATION") {
match std::env::var("SCIP_TREESITTER_PATH") {
Ok(va) => std::env::current_dir().unwrap().join(va),
_ => cargo_bin("scip-treesitter-cli"),
_ => cargo_bin("scip-treesitter"),
}
};
}

2
sg.config.yaml
View File

@ -587,7 +587,7 @@ commands:
- cmd/syntactic-code-intel-worker
- lib/codeintel
env:
SCIP_TREESITTER_COMMAND: dev/scip-treesitter-dev
SCIP_TREESITTER_PATH: dev/scip-treesitter-dev
syntactic-code-intel-worker-0:
<<: *syntactic_codeintel_worker_template