Skip to content

Commit 4ac602c

Browse files
author
Paolo Tranquilli
committed
Merge branch 'main' into redsun82/swift-6
2 parents 9da7e8a + defa4cc commit 4ac602c

File tree

3,443 files changed

+120000
-62295
lines changed

Some content is hidden

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

3,443 files changed

+120000
-62295
lines changed

.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@ common --registry=file:///%workspace%/misc/bazel/registry
2323
common --registry=https://bcr.bazel.build
2424

2525
common --@rules_dotnet//dotnet/settings:strict_deps=false
26-
common --experimental_isolated_extension_usages
2726

2827
try-import %workspace%/local.bazelrc

.bazelrc.internal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ common --registry=https://bcr.bazel.build
88
# its implementation packages without providing any code itself.
99
# We either can depend on internal implementation details, or turn of strict deps.
1010
common --@rules_dotnet//dotnet/settings:strict_deps=false
11-
common --experimental_isolated_extension_usages

.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",

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup dotnet
3131
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: 8.0.101
33+
dotnet-version: 9.0.100
3434

3535
- name: Checkout repository
3636
uses: actions/checkout@v4

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: "Build Swift extractor using Bazel"
4949
run: |
5050
bazel clean --expunge
51-
bazel run //swift:create-extractor-pack --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results --spawn_strategy=local
51+
bazel run //swift:install --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results --spawn_strategy=local
5252
bazel shutdown
5353
5454
- name: Perform CodeQL Analysis

.github/workflows/csharp-qltest.yml

Lines changed: 9 additions & 5 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/*"
@@ -39,14 +43,14 @@ jobs:
3943
- name: Setup dotnet
4044
uses: actions/setup-dotnet@v4
4145
with:
42-
dotnet-version: 8.0.101
46+
dotnet-version: 9.0.100
4347
- name: Extractor unit tests
4448
run: |
4549
dotnet tool restore
46-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Util.Tests
47-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Extraction.Tests
48-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.CSharp.Tests
49-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.Cpp.Tests
50+
dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Util.Tests
51+
dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Extraction.Tests
52+
dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
53+
dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
5054
shell: bash
5155
stubgentest:
5256
runs-on: ubuntu-latest

.github/workflows/csv-coverage-metrics.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
DATABASE="${{ runner.temp }}/java-database"
3939
codeql database analyze --format=sarif-latest --output=metrics-java.sarif -- "$DATABASE" ./java/ql/src/Metrics/Summaries/FrameworkCoverage.ql
40-
- uses: actions/upload-artifact@v3
40+
- uses: actions/upload-artifact@v4
4141
with:
4242
name: metrics-java.sarif
4343
path: metrics-java.sarif
@@ -64,7 +64,7 @@ jobs:
6464
run: |
6565
DATABASE="${{ runner.temp }}/csharp-database"
6666
codeql database analyze --format=sarif-latest --output=metrics-csharp.sarif -- "$DATABASE" ./csharp/ql/src/Metrics/Summaries/FrameworkCoverage.ql
67-
- uses: actions/upload-artifact@v3
67+
- uses: actions/upload-artifact@v4
6868
with:
6969
name: metrics-csharp.sarif
7070
path: metrics-csharp.sarif

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@ jobs:
7171
run: |
7272
python base/misc/scripts/library-coverage/compare-folders.py out_base out_merge comparison.md
7373
- name: Upload CSV package list
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: csv-framework-coverage-merge
7777
path: |
7878
out_merge/framework-coverage-*.csv
7979
out_merge/framework-coverage-*.rst
8080
- name: Upload CSV package list
81-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@v4
8282
with:
8383
name: csv-framework-coverage-base
8484
path: |
8585
out_base/framework-coverage-*.csv
8686
out_base/framework-coverage-*.rst
8787
- name: Upload comparison results
88-
uses: actions/upload-artifact@v3
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: comparison
9191
path: |
@@ -97,7 +97,7 @@ jobs:
9797
env:
9898
PR_NUMBER: ${{ github.event.pull_request.number }}
9999
- name: Upload PR number
100-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
101101
with:
102102
name: pr
103103
path: pr/
@@ -117,7 +117,7 @@ jobs:
117117
GITHUB_TOKEN: ${{ github.token }}
118118
PR_NUMBER: ${{ github.event.pull_request.number }}
119119
- name: Upload comment ID (if it exists)
120-
uses: actions/upload-artifact@v3
120+
uses: actions/upload-artifact@v4
121121
with:
122122
name: comment
123123
path: comment/

.github/workflows/csv-coverage-timeseries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
python script/misc/scripts/library-coverage/generate-timeseries.py codeqlModels
3232
- name: Upload timeseries CSV
33-
uses: actions/upload-artifact@v3
33+
uses: actions/upload-artifact@v4
3434
with:
3535
name: framework-coverage-timeseries
3636
path: framework-coverage-timeseries-*.csv

0 commit comments

Comments
 (0)