Skip to content

Commit e79a28f

Browse files
krishnprakashkrishnprakash
authored
Merge branch 'main' into dependabot/github_actions/actions/download-artifact-7
2 parents 42a3bfb + 91e678d commit e79a28f

161 files changed

Lines changed: 285917 additions & 2005 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.

‎.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@v4
40+
- uses: actions/upload-artifact@v6
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@v4
67+
- uses: actions/upload-artifact@v6
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@v4
74+
uses: actions/upload-artifact@v6
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@v4
81+
uses: actions/upload-artifact@v6
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@v4
88+
uses: actions/upload-artifact@v6
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@v4
100+
uses: actions/upload-artifact@v6
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@v4
120+
uses: actions/upload-artifact@v6
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@v4
33+
uses: actions/upload-artifact@v6
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@v4
37+
uses: actions/upload-artifact@v6
3838
with:
3939
name: framework-coverage-csv
4040
path: framework-coverage-*.csv
4141
- name: Upload RST package list
42-
uses: actions/upload-artifact@v4
42+
uses: actions/upload-artifact@v6
4343
with:
4444
name: framework-coverage-rst
4545
path: framework-coverage-*.rst

‎.github/workflows/mad_modelDiff.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ jobs:
9999
name="diff_${basename/.model.yml/""}"
100100
(diff -w -u $m $t | diff2html -i stdin -F $MODELS/$name.html) || true
101101
done
102-
- uses: actions/upload-artifact@v4
102+
- uses: actions/upload-artifact@v6
103103
with:
104104
name: models-${{ steps.shortname.outputs.SHORTNAME }}
105105
path: tmp-models/**/**/*.model.yml
106106
retention-days: 20
107-
- uses: actions/upload-artifact@v4
107+
- uses: actions/upload-artifact@v6
108108
with:
109109
name: diffs-${{ steps.shortname.outputs.SHORTNAME }}
110110
path: tmp-models/*.html

‎.github/workflows/mad_regenerate-models.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
find java -name "*.model.yml" -print0 | xargs -0 git add
6060
git status
6161
git diff --cached > models.patch
62-
- uses: actions/upload-artifact@v4
62+
- uses: actions/upload-artifact@v6
6363
with:
6464
name: patch
6565
path: models.patch

‎.github/workflows/qhelp-pr-preview.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- run: echo "${PR_NUMBER}" > pr_number.txt
3737
env:
3838
PR_NUMBER: ${{ github.event.number }}
39-
- uses: actions/upload-artifact@v4
39+
- uses: actions/upload-artifact@v6
4040
with:
4141
name: comment-pr-number
4242
path: pr_number.txt
@@ -78,7 +78,7 @@ jobs:
7878
exit "${EXIT_CODE}"
7979
8080
- if: ${{ !cancelled() }}
81-
uses: actions/upload-artifact@v4
81+
uses: actions/upload-artifact@v6
8282
with:
8383
name: comment-body
8484
path: comment_body.txt
@@ -94,7 +94,7 @@ jobs:
9494
GITHUB_TOKEN: ${{ github.token }}
9595
PR_NUMBER: ${{ github.event.number }}
9696

97-
- uses: actions/upload-artifact@v4
97+
- uses: actions/upload-artifact@v6
9898
with:
9999
name: comment-id
100100
path: comment_id.txt

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
sarif_file: ql-for-ql.sarif
7676
category: ql-for-ql
7777
- name: Sarif as artifact
78-
uses: actions/upload-artifact@v4
78+
uses: actions/upload-artifact@v6
7979
with:
8080
name: ql-for-ql.sarif
8181
path: ql-for-ql.sarif
@@ -84,7 +84,7 @@ jobs:
8484
mkdir split-sarif
8585
node ./ql/scripts/split-sarif.js ql-for-ql.sarif split-sarif
8686
- name: Upload langs as artifacts
87-
uses: actions/upload-artifact@v4
87+
uses: actions/upload-artifact@v6
8888
with:
8989
name: ql-for-ql-langs
9090
path: split-sarif

‎.github/workflows/ql-for-ql-dataset_measure.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
"${CODEQL}" dataset measure --threads 4 --output "stats/${{ matrix.repo }}/stats.xml" "${{ runner.temp }}/database/db-ql"
6262
env:
6363
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
64-
- uses: actions/upload-artifact@v4
64+
- uses: actions/upload-artifact@v6
6565
with:
6666
name: measurements
6767
path: stats
@@ -79,7 +79,7 @@ jobs:
7979
- run: |
8080
python -m pip install --user lxml
8181
find stats -name 'stats.xml' -print0 | sort -z | xargs -0 python ruby/scripts/merge_stats.py --output ql/ql/src/ql.dbscheme.stats --normalise ql_tokeninfo
82-
- uses: actions/upload-artifact@v4
82+
- uses: actions/upload-artifact@v6
8383
with:
8484
name: ql.dbscheme.stats
8585
path: ql/ql/src/ql.dbscheme.stats

‎.github/workflows/query-list.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
python codeql/misc/scripts/generate-code-scanning-query-list.py > code-scanning-query-list.csv
3939
- name: Upload code scanning query list
40-
uses: actions/upload-artifact@v4
40+
uses: actions/upload-artifact@v6
4141
with:
4242
name: code-scanning-query-list
4343
path: code-scanning-query-list.csv

0 commit comments

Comments
 (0)