Skip to content

Commit 7f5db16

Browse files
authored
Merge branch 'main' into mbg/pr-template/tests
2 parents dd9e24a + 239d7b2 commit 7f5db16

37 files changed

+494
-372
lines changed

.github/actions/check-sarif/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ inputs:
1616
Comma separated list of query ids that should NOT be included in this SARIF file.
1717
1818
runs:
19-
using: node20
19+
using: node24
2020
main: index.js

.github/workflows/__upload-quality-sarif.yml

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

.github/workflows/__upload-sarif.yml

Lines changed: 158 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__with-checkout-path.yml

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/codescanning-config-cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Set up Node.js
5959
uses: actions/setup-node@v5
6060
with:
61-
node-version: '20'
61+
node-version: 24
6262
cache: 'npm'
6363

6464
- name: Install dependencies

.github/workflows/pr-checks.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
os: [ubuntu-latest, macos-latest, windows-latest]
23+
node-version: [20, 24]
2324
permissions:
2425
contents: read
2526
security-events: write # needed to upload ESLint results
@@ -36,7 +37,7 @@ jobs:
3637
- name: Set up Node.js
3738
uses: actions/setup-node@v5
3839
with:
39-
node-version: '20.x'
40+
node-version: ${{ matrix.node-version }}
4041
cache: 'npm'
4142

4243
- name: Set up Python
@@ -73,7 +74,7 @@ jobs:
7374

7475
- name: Upload sarif
7576
uses: github/codeql-action/upload-sarif@v3
76-
if: matrix.os == 'ubuntu-latest'
77+
if: matrix.os == 'ubuntu-latest' && matrix.node-version == 24
7778
with:
7879
sarif_file: eslint.sarif
7980
category: eslint

.github/workflows/query-filters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install Node.js
3535
uses: actions/setup-node@v5
3636
with:
37-
node-version: 20.x
37+
node-version: 24
3838
cache: npm
3939

4040
- name: Install dependencies

.github/workflows/update-bundle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Set up Node.js
4444
uses: actions/setup-node@v5
4545
with:
46-
node-version: '20.x'
46+
node-version: 24
4747
cache: 'npm'
4848

4949
- name: Install dependencies

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
44

55
## [UNRELEASED]
66

7-
No user facing changes.
7+
- [v4+ only] The CodeQL Action now runs on Node.js v24. [#3169](https://github.com/github/codeql-action/pull/3169)
88

99
## 3.30.6 - 02 Oct 2025
1010

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Please note that this project is released with a [Contributor Code of Conduct][c
1313

1414
## Development and Testing
1515

16-
Before you start, ensure that you have a recent version of node (16 or higher) installed, along with a recent version of npm (9.2 or higher). You can see which version of node is used by the action in `init/action.yml`.
16+
Before you start, ensure that you have a recent version of node (24 or higher) installed, along with a recent version of npm (9.2 or higher). You can see which version of node is used by the action in `init/action.yml`.
1717

1818
### Common tasks
1919

0 commit comments

Comments
 (0)