Skip to content

Commit eb3a76d

Browse files
authored
Merge branch 'github:main' into path-sanitizers
2 parents 8744f15 + 570260b commit eb3a76d

File tree

1,874 files changed

+144932
-91747
lines changed

Some content is hidden

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

1,874 files changed

+144932
-91747
lines changed

.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
common --enable_platform_specific_config
2-
common --enable_bzlmod
32
# because we use --override_module with `%workspace%`, the lock file is not stable
43
common --lockfile_mode=off
54

.bazelversion

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

.github/codeql/codeql-config.yml

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

.github/labeler.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Swift:
3838
- swift/**/*
3939
- change-notes/**/*swift*
4040

41+
Actions:
42+
- actions/**/*
43+
- change-notes/**/*actions*
44+
4145
documentation:
4246
- "**/*.qhelp"
4347
- "**/*.md"

.github/workflows/build-ripunzip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-20.04, macos-12, windows-2019]
20+
os: [ubuntu-20.04, macos-13, windows-2019]
2121
runs-on: ${{ matrix.os }}
2222
steps:
2323
- uses: actions/checkout@v4

.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

.github/workflows/csv-coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
run: |
3535
python script/misc/scripts/library-coverage/generate-report.py ci codeqlModels script
3636
- name: Upload CSV package list
37-
uses: actions/upload-artifact@v3
37+
uses: actions/upload-artifact@v4
3838
with:
3939
name: framework-coverage-csv
4040
path: framework-coverage-*.csv
4141
- name: Upload RST package list
42-
uses: actions/upload-artifact@v3
42+
uses: actions/upload-artifact@v4
4343
with:
4444
name: framework-coverage-rst
4545
path: framework-coverage-*.rst

.github/workflows/mad_modelDiff.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,20 @@ jobs:
3838
path: codeql-main
3939
ref: main
4040
- uses: ./codeql-main/.github/actions/fetch-codeql
41+
# compute the shortname of the project that does not contain any special (disk) characters
42+
- run: |
43+
echo "SHORTNAME=${SLUG//[^a-zA-Z0-9_]/}" >> $GITHUB_OUTPUT
44+
env:
45+
SLUG: ${{ matrix.slug }}
46+
id: shortname
4147
- name: Download database
4248
env:
4349
SLUG: ${{ matrix.slug }}
4450
GH_TOKEN: ${{ github.token }}
51+
SHORTNAME: ${{ steps.shortname.outputs.SHORTNAME }}
4552
run: |
4653
set -x
4754
mkdir lib-dbs
48-
SHORTNAME=${SLUG//[^a-zA-Z0-9_]/}
4955
gh api -H "Accept: application/zip" "/repos/${SLUG}/code-scanning/codeql/databases/java" > "$SHORTNAME.zip"
5056
unzip -q -d "${SHORTNAME}-db" "${SHORTNAME}.zip"
5157
mkdir "lib-dbs/$SHORTNAME/"
@@ -93,14 +99,14 @@ jobs:
9399
name="diff_${basename/.model.yml/""}"
94100
(diff -w -u $m $t | diff2html -i stdin -F $MODELS/$name.html) || true
95101
done
96-
- uses: actions/upload-artifact@v3
102+
- uses: actions/upload-artifact@v4
97103
with:
98-
name: models
104+
name: models-${{ steps.shortname.outputs.SHORTNAME }}
99105
path: tmp-models/**/**/*.model.yml
100106
retention-days: 20
101-
- uses: actions/upload-artifact@v3
107+
- uses: actions/upload-artifact@v4
102108
with:
103-
name: diffs
109+
name: diffs-${{ steps.shortname.outputs.SHORTNAME }}
104110
path: tmp-models/*.html
105111
# An html file is only produced if the generated models differ.
106112
if-no-files-found: ignore

0 commit comments

Comments
 (0)