Skip to content

Commit df06d34

Browse files
authored
Merge branch 'main' into interprocedural-controlflow
2 parents 57f5b97 + 3237b2c commit df06d34

File tree

6,198 files changed

+282486
-114343
lines changed

Some content is hidden

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

6,198 files changed

+282486
-114343
lines changed

.bazelrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,12 @@ common --registry=https://bcr.bazel.build
2424

2525
common --@rules_dotnet//dotnet/settings:strict_deps=false
2626

27+
# Reduce this eventually to empty, once we've fixed all our usages of java, and https://github.com/bazel-contrib/rules_go/issues/4193 is fixed
28+
common --incompatible_autoload_externally="+@rules_java,+@rules_shell"
29+
30+
build --java_language_version=17
31+
build --tool_java_language_version=17
32+
build --tool_java_runtime_version=remotejdk_17
33+
build --java_runtime_version=remotejdk_17
34+
2735
try-import %workspace%/local.bazelrc

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0rc1
1+
8.0.0

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
23
"extensions": [
34
"rust-lang.rust-analyzer",
45
"bungcip.better-toml",

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,5 @@
8686
/misc/ripunzip/ripunzip-* filter=lfs diff=lfs merge=lfs -text
8787

8888
# swift prebuilt resources
89-
/swift/third_party/resource-dir/*.zip filter=lfs diff=lfs merge=lfs -text
89+
/swift/third_party/resources/*.zip filter=lfs diff=lfs merge=lfs -text
90+
/swift/third_party/resources/*.tar.zst filter=lfs diff=lfs merge=lfs -text

.github/codeql/codeql-config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ paths-ignore:
99
- '/python/'
1010
- '/javascript/ql/test'
1111
- '/javascript/extractor/tests'
12-
- '/rust/ql/test'
13-
- '/rust/ql/integration-tests'
12+
- '/rust/ql'

.github/workflows/check-qldoc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
run: |
3131
EXIT_CODE=0
3232
# TODO: remove the shared exception from the regex when coverage of qlpacks without dbschemes is supported
33-
changed_lib_packs="$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | { grep -Po '^(?!(shared))[a-z]*/ql/lib' || true; } | sort -u)"
33+
# TODO: remove the actions exception once https://github.com/github/codeql-team/issues/3656 is fixed
34+
changed_lib_packs="$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | { grep -Po '^(?!(shared|actions))[a-z]*/ql/lib' || true; } | sort -u)"
3435
for pack_dir in ${changed_lib_packs}; do
3536
lang="${pack_dir%/ql/lib}"
3637
codeql generate library-doc-coverage --output="${RUNNER_TEMP}/${lang}-current.txt" --dir="${pack_dir}"

.github/workflows/compile-queries.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
- "rc/*"
88
- "codeql-cli-*"
99
pull_request:
10+
paths:
11+
- '**.ql'
12+
- '**.qll'
13+
- '**/qlpack.yml'
14+
- '**.dbscheme'
1015

1116
permissions:
1217
contents: read
@@ -33,9 +38,9 @@ jobs:
3338
# run with --check-only if running in a PR (github.sha != main)
3439
if : ${{ github.event_name == 'pull_request' }}
3540
shell: bash
36-
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
41+
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000
3742
- name: compile queries - full
3843
# do full compile if running on main - this populates the cache
3944
if : ${{ github.event_name != 'pull_request' }}
4045
shell: bash
41-
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
46+
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000

.github/workflows/cpp-swift-analysis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
CodeQL-Build:
2121

22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
2323

2424
permissions:
2525
contents: read
@@ -38,12 +38,10 @@ jobs:
3838
languages: cpp
3939
config-file: ./.github/codeql/codeql-config.yml
4040

41-
- name: "[Ubuntu] Remove GCC 13 from runner image"
42-
shell: bash
41+
- name: Install dependencies
4342
run: |
44-
sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
4543
sudo apt-get update
46-
sudo apt-get install -y --allow-downgrades libc6=2.35-* libc6-dev=2.35-* libstdc++6=12.3.0-* libgcc-s1=12.3.0-*
44+
sudo apt-get install -y uuid-dev
4745
4846
- name: "Build Swift extractor using Bazel"
4947
run: |

.github/workflows/csharp-qltest.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@ on:
55
paths:
66
- "csharp/**"
77
- "shared/**"
8+
- "misc/bazel/**"
89
- .github/actions/fetch-codeql/action.yml
910
- codeql-workspace.yml
11+
- "MODULE.bazel"
1012
branches:
1113
- main
1214
- "rc/*"
1315
pull_request:
1416
paths:
1517
- "csharp/**"
1618
- "shared/**"
19+
- "misc/bazel/**"
1720
- .github/workflows/csharp-qltest.yml
1821
- .github/actions/fetch-codeql/action.yml
1922
- codeql-workspace.yml
23+
- "MODULE.bazel"
2024
branches:
2125
- main
2226
- "rc/*"

.github/workflows/ql-for-ql-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
ql/target
4141
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-qltest-cargo-${{ hashFiles('ql/rust-toolchain.toml', 'ql/**/Cargo.lock') }}
4242
- name: Check formatting
43-
run: cd ql; cargo fmt --all -- --check
43+
run: cd ql; cargo fmt -- --check
4444
- name: Build extractor
4545
run: |
4646
cd ql;

0 commit comments

Comments
 (0)