hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bazel: Flip --incompatible_use_plus_in_repo_names.

Browse Source 
We've hardcoded the tilde in a lot of places :(
This improves performance on Windows and gets us ready for Bazel 8.

We need an upgrade of rules_rust for this to work.
This commit is contained in:
Cornelius Riemenschneider
2024-10-09 14:04:05 +02:00
parent 6ffdf576d0
commit 4c21444dd5
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.bazelrc
View File

@@ -25,5 +25,6 @@ common --registry=https://bcr.bazel.build
common --@rules_dotnet//dotnet/settings:strict_deps=false common --@rules_dotnet//dotnet/settings:strict_deps=false
common --experimental_isolated_extension_usages common --experimental_isolated_extension_usages
common --incompatible_use_plus_in_repo_names
try-import %workspace%/local.bazelrc try-import %workspace%/local.bazelrc

2
MODULE.bazel
View File

@@ -27,7 +27,7 @@ bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
bazel_dep(name = "gazelle", version = "0.38.0") bazel_dep(name = "gazelle", version = "0.38.0")
bazel_dep(name = "rules_dotnet", version = "0.15.1") bazel_dep(name = "rules_dotnet", version = "0.15.1")
bazel_dep(name = "googletest", version = "1.14.0.bcr.1") bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
bazel_dep(name = "rules_rust", version = "0.50.0") bazel_dep(name = "rules_rust", version = "0.52.2")
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True) bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)

2
java/kotlin-extractor/deps.bzl
View File

@@ -17,7 +17,7 @@ def _get_dep(repository_ctx, name):
return repository_ctx.path(Label("//java/kotlin-extractor/deps:%s" % name)) return repository_ctx.path(Label("//java/kotlin-extractor/deps:%s" % name))
def _kotlin_dep_impl(repository_ctx): def _kotlin_dep_impl(repository_ctx):
_, _, name = repository_ctx.name.rpartition("~") _, _, name = repository_ctx.name.rpartition("+")
lfs_smudge(repository_ctx, [_get_dep(repository_ctx, name + ".jar")]) lfs_smudge(repository_ctx, [_get_dep(repository_ctx, name + ".jar")])
# for some reason rules_kotlin warns about these jars missing, this is to silence those warnings # for some reason rules_kotlin warns about these jars missing, this is to silence those warnings

2
misc/bazel/internal/zipmerge/zipmerge_test.cpp
View File

@@ -75,7 +75,7 @@ std::string get_file(const char* name) {
return ret; return ret;
}(); }();
// this works from both `codeql` and the internal repository // this works from both `codeql` and the internal repository
for (auto prefix : {"_main", "ql~"}) { for (auto prefix : {"_main", "ql+"}) {
auto ret = runfiles->Rlocation(prefix + "/misc/bazel/internal/zipmerge/test-files/"s + name); auto ret = runfiles->Rlocation(prefix + "/misc/bazel/internal/zipmerge/test-files/"s + name);
if (fs::exists(ret)) { if (fs::exists(ret)) {
return ret; return ret;

4
misc/bazel/lfs.bzl
View File

@@ -64,8 +64,8 @@ def _download_lfs(repository_ctx):
srcs = [f for f in dir.readdir() if not f.is_dir] srcs = [f for f in dir.readdir() if not f.is_dir]
lfs_smudge(repository_ctx, srcs, executable = repository_ctx.attr.executable) lfs_smudge(repository_ctx, srcs, executable = repository_ctx.attr.executable)
# with bzlmod the name is qualified with `~` separators, and we want the base name here # with bzlmod the name is qualified with `+` separators, and we want the base name here
name = repository_ctx.name.split("~")[-1] name = repository_ctx.name.split("+")[-1]
basenames = [src.basename for src in srcs] basenames = [src.basename for src in srcs]
build = "exports_files(%s)\n" % repr(basenames) build = "exports_files(%s)\n" % repr(basenames)

2
misc/ripunzip/install.sh
View File

@@ -2,7 +2,7 @@
set -eu set -eu
source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh source misc/bazel/runfiles.sh 2>/dev/null || source external/ql+/misc/bazel/runfiles.sh
dest="${2:-$HOME/.local/bin}" dest="${2:-$HOME/.local/bin}"

2
rust/codegen/codegen.sh
View File

@@ -2,7 +2,7 @@
set -eu set -eu
source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh source misc/bazel/runfiles.sh 2>/dev/null || source external/ql+/misc/bazel/runfiles.sh
ast_generator="$(rlocation "$1")" ast_generator="$(rlocation "$1")"
ast_generator_manifest="$(rlocation "$2")" ast_generator_manifest="$(rlocation "$2")"