Skip to content

Commit d08713f

Browse files
Merge branch 'main' into patch-7
2 parents 1728e5d + 75aa439 commit d08713f

File tree

2,520 files changed

+189041
-40588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,520 files changed

+189041
-40588
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0
1+
7.2.1

.devcontainer/swift/root.sh

100644100755
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,26 @@ set -xe
33
BAZELISK_VERSION=v1.12.0
44
BAZELISK_DOWNLOAD_SHA=6b0bcb2ea15bca16fffabe6fda75803440375354c085480fe361d2cbf32501db
55

6+
# install git lfs apt source
7+
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
8+
9+
# install gh apt source
10+
(type -p wget >/dev/null || (sudo apt update && sudo apt-get install wget -y)) \
11+
&& sudo mkdir -p -m 755 /etc/apt/keyrings \
12+
&& wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
13+
&& sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
14+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
15+
616
apt-get update
717
export DEBIAN_FRONTEND=noninteractive
818
apt-get -y install --no-install-recommends \
919
zlib1g-dev \
1020
uuid-dev \
1121
python3-distutils \
1222
python3-pip \
13-
bash-completion
23+
bash-completion \
24+
git-lfs \
25+
gh
1426

1527
# Install Bazel
1628
curl -fSsL -o /usr/local/bin/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-linux-amd64

.devcontainer/swift/user.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set -xe
22

3+
git lfs install
4+
35
# add the workspace to the codeql search path
46
mkdir -p /home/vscode/.config/codeql
57
echo "--search-path /workspaces/codeql" > /home/vscode/.config/codeql/config

MODULE.bazel

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ local_path_override(
1414
# see https://registry.bazel.build/ for a list of available packages
1515

1616
bazel_dep(name = "platforms", version = "0.0.10")
17-
bazel_dep(name = "rules_go", version = "0.48.0")
17+
bazel_dep(name = "rules_go", version = "0.49.0")
1818
bazel_dep(name = "rules_pkg", version = "0.10.1")
19-
bazel_dep(name = "rules_nodejs", version = "6.2.0")
19+
bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
2020
bazel_dep(name = "rules_python", version = "0.32.2")
2121
bazel_dep(name = "bazel_skylib", version = "1.6.1")
2222
bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
2323
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2424
bazel_dep(name = "fmt", version = "10.0.0")
2525
bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
26-
bazel_dep(name = "gazelle", version = "0.37.0")
26+
bazel_dep(name = "gazelle", version = "0.38.0")
2727
bazel_dep(name = "rules_dotnet", version = "0.15.1")
2828
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
29-
bazel_dep(name = "rules_rust", version = "0.46.0")
29+
bazel_dep(name = "rules_rust", version = "0.49.1")
3030

3131
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
3232

@@ -85,6 +85,10 @@ use_repo(
8585
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
8686
node.toolchain(
8787
name = "nodejs",
88+
node_urls = [
89+
"https://nodejs.org/dist/v{version}/{filename}",
90+
"https://mirrors.dotsrc.org/nodejs/release/v{version}/{filename}",
91+
],
8892
node_version = "18.15.0",
8993
)
9094
use_repo(node, "nodejs", "nodejs_toolchains")
@@ -108,6 +112,7 @@ use_repo(
108112
"kotlin-compiler-1.9.0-Beta",
109113
"kotlin-compiler-1.9.20-Beta",
110114
"kotlin-compiler-2.0.0-RC1",
115+
"kotlin-compiler-2.0.20-Beta2",
111116
"kotlin-compiler-embeddable-1.5.0",
112117
"kotlin-compiler-embeddable-1.5.10",
113118
"kotlin-compiler-embeddable-1.5.20",
@@ -120,6 +125,7 @@ use_repo(
120125
"kotlin-compiler-embeddable-1.9.0-Beta",
121126
"kotlin-compiler-embeddable-1.9.20-Beta",
122127
"kotlin-compiler-embeddable-2.0.0-RC1",
128+
"kotlin-compiler-embeddable-2.0.20-Beta2",
123129
"kotlin-stdlib-1.5.0",
124130
"kotlin-stdlib-1.5.10",
125131
"kotlin-stdlib-1.5.20",
@@ -132,11 +138,16 @@ use_repo(
132138
"kotlin-stdlib-1.9.0-Beta",
133139
"kotlin-stdlib-1.9.20-Beta",
134140
"kotlin-stdlib-2.0.0-RC1",
141+
"kotlin-stdlib-2.0.20-Beta2",
135142
)
136143

137144
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
138145
go_sdk.download(version = "1.22.2")
139146

147+
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
148+
go_deps.from_file(go_mod = "//go/extractor:go.mod")
149+
use_repo(go_deps, "org_golang_x_mod", "org_golang_x_tools")
150+
140151
lfs_files = use_repo_rule("//misc/bazel:lfs.bzl", "lfs_files")
141152

142153
lfs_files(

config/identical-files.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
"java/ql/src/utils/modelgenerator/internal/CaptureModels.qll",
6262
"csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll"
6363
],
64-
"Model as Data Generation Java/C# - CaptureModelsPrinting": [
65-
"java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll",
66-
"csharp/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll"
67-
],
6864
"Sign Java/C#": [
6965
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
7066
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll"
@@ -185,11 +181,6 @@
185181
"cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysisImports.qll",
186182
"cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysisImports.qll"
187183
],
188-
"C++ IR ValueNumberingImports": [
189-
"cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingImports.qll",
190-
"cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll",
191-
"cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingImports.qll"
192-
],
193184
"IR SSA SSAConstruction": [
194185
"cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll",
195186
"cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll"

0 commit comments

Comments
 (0)