Skip to content

Commit 994e551

Browse files
authored
Merge branch 'main' into redsun82/just2
2 parents 0f28502 + 017b6f2 commit 994e551

File tree

4,762 files changed

+472159
-205770
lines changed

Some content is hidden

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

4,762 files changed

+472159
-205770
lines changed

.bazelrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ build --compilation_mode opt
1111
common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
1212

1313
build --repo_env=CC=clang --repo_env=CXX=clang++
14+
# Disable Android SDK auto-detection (we don't use it, and rules_android has Bazel 9 compatibility issues)
15+
build --repo_env=ANDROID_HOME=
1416

1517
# print test output, like sembuild does.
1618
# Set to `errors` if this is too verbose.
@@ -34,7 +36,7 @@ common --@rules_dotnet//dotnet/settings:strict_deps=false
3436
common --@rules_rust//rust/toolchain/channel=nightly
3537

3638
# 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
37-
common --incompatible_autoload_externally="+@rules_java,+@rules_shell"
39+
common --incompatible_autoload_externally="+@rules_cc,+@rules_java,+@rules_shell"
3840

3941
build --java_language_version=17
4042
build --tool_java_language_version=17

.bazelversion

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

.gitattributes

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@
8282
/csharp/paket.main.bzl linguist-generated=true
8383
/csharp/paket.main_extension.bzl linguist-generated=true
8484

85-
# ripunzip tool
86-
/misc/ripunzip/ripunzip-* filter=lfs diff=lfs merge=lfs -text
87-
8885
# swift prebuilt resources
8986
/swift/third_party/resources/*.zip filter=lfs diff=lfs merge=lfs -text
9087
/swift/third_party/resources/*.tar.zst filter=lfs diff=lfs merge=lfs -text

.github/commands/rerun.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
trigger: rerun
3+
title: Rerun failed internal checks
4+
surfaces:
5+
- pull_request
6+
description: >
7+
Finds all failed internal CI checks for this PR and reruns their failed jobs.
8+
9+
steps:
10+
- type: repository_dispatch
11+
eventType: rerun-workflow
12+
- type: fill
13+
submit_form: true
14+
template: "Rerun has been triggered."

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,8 @@ updates:
4040
- dependency-name: "*"
4141
reviewers:
4242
- "github/codeql-go"
43+
44+
- package-ecosystem: bazel
45+
directory: "/"
46+
schedule:
47+
interval: weekly

.github/workflows/build-ripunzip.yml

Lines changed: 0 additions & 166 deletions
This file was deleted.

.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: 9.0.300
37+
dotnet-version: 10.0.100
3838

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

.github/workflows/compile-queries.yml

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,41 @@ permissions:
1717
contents: read
1818

1919
jobs:
20-
compile-queries:
20+
detect-changes:
2121
if: github.repository_owner == 'github'
22+
runs-on: ubuntu-latest
23+
outputs:
24+
languages: ${{ steps.detect.outputs.languages }}
25+
steps:
26+
- uses: actions/checkout@v5
27+
- name: Detect changed languages
28+
id: detect
29+
run: |
30+
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
31+
# For PRs, detect which languages have changes
32+
changed_files=$(gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path')
33+
languages=()
34+
for lang in actions cpp csharp go java javascript python ql ruby rust swift; do
35+
if echo "$changed_files" | grep -qE "^($lang/|shared/)" ; then
36+
languages+=("$lang")
37+
fi
38+
done
39+
echo "languages=$(jq -c -n '$ARGS.positional' --args "${languages[@]}")" >> $GITHUB_OUTPUT
40+
else
41+
# For pushes to main/rc branches, run all languages
42+
echo 'languages=["actions","cpp","csharp","go","java","javascript","python","ql","ruby","rust","swift"]' >> $GITHUB_OUTPUT
43+
fi
44+
env:
45+
GH_TOKEN: ${{ github.token }}
46+
47+
compile-queries:
48+
needs: detect-changes
49+
if: github.repository_owner == 'github' && needs.detect-changes.outputs.languages != '[]'
2250
runs-on: ubuntu-latest-xl
51+
strategy:
52+
fail-fast: false
53+
matrix:
54+
language: ${{ fromJson(needs.detect-changes.outputs.languages) }}
2355

2456
steps:
2557
- uses: actions/checkout@v5
@@ -31,16 +63,16 @@ jobs:
3163
id: query-cache
3264
uses: ./.github/actions/cache-query-compilation
3365
with:
34-
key: all-queries
66+
key: ${{ matrix.language }}-queries
3567
- name: check formatting
36-
run: find shared */ql -type f \( -name "*.qll" -o -name "*.ql" \) -print0 | xargs -0 -n 3000 -P 10 codeql query format -q --check-only
68+
run: find shared ${{ matrix.language }}/ql -type f \( -name "*.qll" -o -name "*.ql" \) -print0 | xargs -0 -n 3000 -P 10 codeql query format -q --check-only
3769
- name: compile queries - check-only
3870
# run with --check-only if running in a PR (github.sha != main)
3971
if : ${{ github.event_name == 'pull_request' }}
4072
shell: bash
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
73+
run: codeql query compile -q -j0 ${{ matrix.language }}/ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000
4274
- name: compile queries - full
4375
# do full compile if running on main - this populates the cache
4476
if : ${{ github.event_name != 'pull_request' }}
4577
shell: bash
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
78+
run: codeql query compile -q -j0 ${{ matrix.language }}/ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000

.github/workflows/csharp-qltest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ jobs:
4343
- name: Setup dotnet
4444
uses: actions/setup-dotnet@v4
4545
with:
46-
dotnet-version: 9.0.300
46+
dotnet-version: 10.0.100
4747
- name: Extractor unit tests
4848
run: |
4949
dotnet tool restore
50-
dotnet test -p:RuntimeFrameworkVersion=9.0.5 extractor/Semmle.Util.Tests
51-
dotnet test -p:RuntimeFrameworkVersion=9.0.5 extractor/Semmle.Extraction.Tests
52-
dotnet test -p:RuntimeFrameworkVersion=9.0.5 autobuilder/Semmle.Autobuild.CSharp.Tests
53-
dotnet test -p:RuntimeFrameworkVersion=9.0.5 autobuilder/Semmle.Autobuild.Cpp.Tests
50+
dotnet test -p:RuntimeFrameworkVersion=10.0.0 extractor/Semmle.Util.Tests
51+
dotnet test -p:RuntimeFrameworkVersion=10.0.0 extractor/Semmle.Extraction.Tests
52+
dotnet test -p:RuntimeFrameworkVersion=10.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
53+
dotnet test -p:RuntimeFrameworkVersion=10.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
5454
shell: bash
5555
stubgentest:
5656
runs-on: ubuntu-latest

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
uses: github/codeql-action/init@main
2828
with:
2929
languages: javascript # does not matter
30+
tools: nightly
3031
- uses: ./.github/actions/os-version
3132
id: os_version
3233
### Build the extractor ###

0 commit comments

Comments
 (0)