Skip to content

Commit 63118a9

Browse files
authored
Merge branch 'main' into kaspersv/disable-rtjo-for-select-preds-js
2 parents 8060021 + fcb928c commit 63118a9

6,301 files changed

Lines changed: 337059 additions & 369600 deletions

File tree

Some content is hidden

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

‎.bazelrc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ common --lockfile_mode=off
55
# Build release binaries by default, can be overwritten to in local.bazelrc and set to `fastbuild` or `dbg`
66
build --compilation_mode opt
77

8+
# Preserve CodeQL's placeholder during rules_pkg variable substitution.
9+
build --define=CODEQL_PLATFORM={CODEQL_PLATFORM}
10+
811
# when building from this repository in isolation, the internal repository will not be found at ..
912
# where `MODULE.bazel` looks for it. The following will get us past the module loading phase, so
1013
# that we can build things that do not rely on that
@@ -46,5 +49,7 @@ build --tool_java_language_version=17
4649
build --tool_java_runtime_version=remotejdk_17
4750
build --java_runtime_version=remotejdk_17
4851
build --@rules_python//python/config_settings:python_version=3.12
52+
# Disable legacy Python initializer generation, including in external build tools.
53+
build --incompatible_default_to_explicit_init_py
4954

5055
try-import %workspace%/local.bazelrc

‎.bazelrc.internal‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# this file should contain bazel settings required to build things from `semmle-code`
22

3+
# Preserve CodeQL's placeholder during rules_pkg variable substitution.
4+
build --define=CODEQL_PLATFORM={CODEQL_PLATFORM}
5+
36
common --registry=file:///%workspace%/ql/misc/bazel/registry
47
common --registry=https://bcr.bazel.build
58

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.0.0
1+
9.3.1

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,22 @@ updates:
44
directory: "ruby"
55
schedule:
66
interval: "daily"
7+
cooldown:
8+
default-days: 7
79

810
- package-ecosystem: "cargo"
911
directory: "ql"
1012
schedule:
1113
interval: "daily"
14+
cooldown:
15+
default-days: 7
1216

1317
- package-ecosystem: "github-actions"
1418
directory: "/"
1519
schedule:
1620
interval: "daily"
21+
cooldown:
22+
default-days: 7
1723
ignore:
1824
- dependency-name: '*'
1925
update-types: ['version-update:semver-patch', 'version-update:semver-minor']
@@ -22,6 +28,8 @@ updates:
2228
directory: "go/extractor"
2329
schedule:
2430
interval: "daily"
31+
cooldown:
32+
default-days: 7
2533
allow:
2634
- dependency-name: "golang.org/x/mod"
2735
- dependency-name: "golang.org/x/tools"
@@ -36,6 +44,8 @@ updates:
3644
directory: "go/ql/test"
3745
schedule:
3846
interval: "monthly"
47+
cooldown:
48+
default-days: 7
3949
ignore:
4050
- dependency-name: "*"
4151
reviewers:
@@ -45,5 +55,7 @@ updates:
4555
directory: "/"
4656
schedule:
4757
interval: weekly
58+
cooldown:
59+
default-days: 7
4860
exclude-paths:
4961
- "misc/bazel/registry/**"

‎.github/skills/bazel/SKILL.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,8 @@ the platform string here; use `os.bzl`.
8181

8282
[`codeql_platform_select`](../../../misc/bazel/os.bzl) takes one keyword argument per CodeQL platform: `linux64`,
8383
`linux_arm64`, `osx64` and `win64`. `otherwise` supplies the value for whichever of those you leave unset; it is **not**
84-
a `//conditions:default`. **There is deliberately no fallback from `linux_arm64` to `linux64`.** If you only care about
85-
the OS, use `os_select`, which gives Linux the same value on both architectures and has a `posix` shorthand for the
86-
shared Linux/macOS value.
84+
a `//conditions:default`. If you only care about the OS, use `os_select`, which gives Linux the same value on both
85+
architectures and has a `posix` shorthand for the shared Linux/macOS value.
8786

8887
In a macro (no `ctx`) it returns a `select()`:
8988

@@ -146,7 +145,7 @@ In order of preference:
146145
keep its checksum field populated.
147146

148147
Vendored Rust crates under [`misc/bazel/3rdparty`](../../../misc/bazel/3rdparty) are generated. Regenerate with
149-
[`update_cargo_deps.sh`](../../../misc/bazel/3rdparty/update_cargo_deps.sh) rather than editing, and keep the
148+
[`update_all_rust_deps.sh`](../../../misc/bazel/3rdparty/update_all_rust_deps.sh) rather than editing, and keep the
150149
`use_repo` lists in sync, which `bazel mod tidy` does for module extensions.
151150

152151
## Building standalone

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup dotnet
3535
uses: actions/setup-dotnet@v4
3636
with:
37-
dotnet-version: 10.0.100
37+
dotnet-version: 10.0.201
3838

3939
- name: Checkout repository
4040
uses: actions/checkout@v5

‎.github/workflows/cpp-bmn.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: C/C++ build mode none extractor
2+
3+
on:
4+
pull_request:
5+
paths: &bmn_paths
6+
- "cpp/extractor/bmn/**"
7+
- "Cargo.toml"
8+
- "Cargo.lock"
9+
- "rust-toolchain.toml"
10+
- "misc/bazel/3rdparty/rust_workspace_deps/**"
11+
- "misc/bazel/3rdparty/rust_workspace_deps_extension.bzl"
12+
- "misc/bazel/3rdparty/update_rust_workspace_deps.sh"
13+
- "misc/bazel/3rdparty/BUILD.bazel"
14+
- "misc/bazel/rust.bzl"
15+
- "MODULE.bazel"
16+
- ".github/workflows/cpp-bmn.yml"
17+
push:
18+
branches:
19+
- main
20+
- "rc/*"
21+
paths: *bmn_paths
22+
23+
permissions:
24+
contents: read
25+
26+
jobs:
27+
cargo:
28+
runs-on: ubuntu-latest
29+
defaults:
30+
run:
31+
working-directory: cpp/extractor/bmn
32+
steps:
33+
- uses: actions/checkout@v5
34+
- name: Check formatting
35+
run: cargo fmt --check
36+
- name: Check
37+
run: cargo check
38+
- name: Clippy
39+
run: cargo clippy --all-targets --no-deps -- -D warnings
40+
- name: Test
41+
run: cargo test
42+
43+
bazel:
44+
runs-on: ubuntu-latest
45+
steps:
46+
- uses: actions/checkout@v5
47+
- name: Build
48+
run: bazel build //cpp/extractor/bmn:bmn
49+
- name: Test
50+
run: bazel test //cpp/extractor/bmn:tests

‎.github/workflows/csharp-qltest.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ jobs:
5151
- name: Setup dotnet
5252
uses: actions/setup-dotnet@v4
5353
with:
54-
dotnet-version: 10.0.100
54+
dotnet-version: 10.0.201
5555
- name: Extractor unit tests
5656
run: |
5757
dotnet tool restore
58-
dotnet test -p:RuntimeFrameworkVersion=10.0.0 extractor/Semmle.Util.Tests
59-
dotnet test -p:RuntimeFrameworkVersion=10.0.0 extractor/Semmle.Extraction.Tests
60-
dotnet test -p:RuntimeFrameworkVersion=10.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
61-
dotnet test -p:RuntimeFrameworkVersion=10.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
58+
dotnet test -p:RuntimeFrameworkVersion=10.0.5 extractor/Semmle.Util.Tests
59+
dotnet test -p:RuntimeFrameworkVersion=10.0.5 extractor/Semmle.Extraction.Tests
60+
dotnet test -p:RuntimeFrameworkVersion=10.0.5 autobuilder/Semmle.Autobuild.CSharp.Tests
61+
dotnet test -p:RuntimeFrameworkVersion=10.0.5 autobuilder/Semmle.Autobuild.Cpp.Tests
6262
shell: bash
6363
stubgentest:
6464
runs-on: ubuntu-latest

‎.github/workflows/csv-coverage-pr-artifacts.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
git checkout HEAD^1
4848
git log -1 --format='%H'
4949
working-directory: base
50-
- name: Set up Python 3.8
50+
- name: Set up Python 3.12
5151
uses: actions/setup-python@v4
5252
with:
53-
python-version: 3.8
53+
python-version: "3.12"
5454
- name: Download CodeQL CLI
5555
uses: ./merge/.github/actions/fetch-codeql
5656
- name: Generate CSV files on merge commit of the PR

‎.github/workflows/csv-coverage-pr-comment.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
run: echo "$GITHUB_CONTEXT"
2626
- name: Clone self (github/codeql)
2727
uses: actions/checkout@v5
28-
- name: Set up Python 3.8
28+
- name: Set up Python 3.12
2929
uses: actions/setup-python@v4
3030
with:
31-
python-version: 3.8
31+
python-version: "3.12"
3232

3333
- name: Check coverage difference file and comment
3434
env:

0 commit comments

Comments
 (0)