Skip to content

Commit 508b83b

Browse files
henrymercerCopilot
henrymercer
and
Copilot
committed
Merge main into overlay minimum disk feature branch
Resolve the overlap with the separately shipped promotion of the overlay resource checks while preserving the feature-flagged minimum disk thresholds. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
2 parents 794f5bc + d97b342 commit 508b83b

29 files changed

Lines changed: 2262 additions & 1523 deletions

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
66

77
No user facing changes.
88

9+
## 4.37.7 - 13 Aug 2026
10+
11+
- Update default CodeQL bundle version to [2.26.3](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.3). [#4085](https://github.com/github/codeql-action/pull/4085)
12+
913
## 4.37.6 - 04 Aug 2026
1014

1115
- Changed the default filepath for the new remote file address format that was introduced in CodeQL Action 4.37.0 / 3.37.0 to `.github/codeql-config.yml` to align it with the suggested path that is used elsewhere. [#4070](https://github.com/github/codeql-action/pull/4070)

‎lib/defaults.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.26.2",
3-
"cliVersion": "2.26.2",
4-
"priorBundleVersion": "codeql-bundle-v2.26.1",
5-
"priorCliVersion": "2.26.1"
2+
"bundleVersion": "codeql-bundle-v2.26.3",
3+
"cliVersion": "2.26.3",
4+
"priorBundleVersion": "codeql-bundle-v2.26.2",
5+
"priorCliVersion": "2.26.2"
66
}

‎lib/entry-points.js‎

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

‎package-lock.json‎

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

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "4.37.7",
3+
"version": "4.37.8",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {
@@ -30,22 +30,22 @@
3030
"@actions/http-client": "^3.0.0",
3131
"@actions/io": "^2.0.0",
3232
"@actions/tool-cache": "^3.0.1",
33-
"@octokit/core": "^7.0.6",
33+
"@octokit/core": "^7.0.7",
3434
"@octokit/plugin-paginate-rest": "^14.0.0",
3535
"@octokit/plugin-rest-endpoint-methods": "^17.0.0",
36-
"@octokit/plugin-retry": "^8.1.0",
36+
"@octokit/plugin-retry": "^8.1.1",
3737
"archiver": "^8.0.0",
3838
"fast-deep-equal": "^3.1.3",
3939
"follow-redirects": "^1.16.0",
4040
"get-folder-size": "^5.0.0",
4141
"https-proxy-agent": "^7.0.6",
42-
"js-yaml": "^5.2.2",
42+
"js-yaml": "^5.2.3",
4343
"jsonschema": "1.5.0",
4444
"long": "^5.3.2",
4545
"node-forge": "^1.4.0",
4646
"semver": "^7.8.5",
4747
"uuid": "^14.0.1",
48-
"undici": "^6.24.0"
48+
"undici": "^6.28.0"
4949
},
5050
"devDependencies": {
5151
"@ava/typescript": "6.0.0",
@@ -58,22 +58,22 @@
5858
"@types/node": "^20.19.43",
5959
"@types/node-forge": "^1.3.14",
6060
"@types/sarif": "^2.1.7",
61-
"@types/semver": "^7.7.1",
61+
"@types/semver": "^7.8.0",
6262
"@types/sinon": "^22.0.0",
6363
"ava": "^6.4.1",
6464
"esbuild": "^0.28.1",
6565
"eslint": "^9.39.5",
6666
"eslint-import-resolver-typescript": "^4.4.5",
67-
"eslint-plugin-github": "^6.1.1",
67+
"eslint-plugin-github": "^6.1.2",
6868
"eslint-plugin-import-x": "^4.17.1",
6969
"eslint-plugin-jsdoc": "^62.9.0",
7070
"eslint-plugin-no-async-foreach": "^0.1.1",
7171
"glob": "^13.0.6",
72-
"globals": "^17.8.0",
73-
"nock": "^14.0.16",
72+
"globals": "^17.9.0",
73+
"nock": "^14.0.17",
7474
"sinon": "^22.1.0",
7575
"typescript": "^6.0.3",
76-
"typescript-eslint": "^8.65.0"
76+
"typescript-eslint": "^8.66.0"
7777
},
7878
"overrides": {
7979
"@actions/tool-cache": {
@@ -95,6 +95,6 @@
9595
"semver": ">=6.3.1"
9696
},
9797
"glob": "^13.0.6",
98-
"undici": "^6.24.0"
98+
"undici": "^6.28.0"
9999
}
100100
}

‎pr-checks/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"dependencies": {
55
"@actions/core": "^2.0.3",
66
"@actions/github": "^8.0.1",
7-
"@octokit/core": "^7.0.6",
7+
"@octokit/core": "^7.0.7",
88
"@octokit/plugin-paginate-rest": ">=9.2.2",
99
"@octokit/plugin-rest-endpoint-methods": "^17.0.0",
1010
"semver": "^7.8.5",
1111
"yaml": "^2.9.0"
1212
},
1313
"devDependencies": {
1414
"@types/node": "^20.19.43",
15-
"tsx": "^4.23.1"
15+
"tsx": "^4.23.8"
1616
}
1717
}

‎src/analyze-action-post.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export async function runWrapper() {
3838
logger,
3939
);
4040
if (config !== undefined) {
41-
const codeql = await getCodeQL(config.codeQLCmd);
41+
const codeql = await getCodeQL(logger, config.codeQLCmd);
4242
const version = await codeql.getVersion();
4343
await debugArtifacts.uploadCombinedSarifArtifacts(
4444
logger,

‎src/analyze-action.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ async function run({ startedAt, logger }: ActionState<["Base", "Logger"]>) {
255255
);
256256
}
257257

258-
const codeql = await getCodeQL(config.codeQLCmd);
258+
const codeql = await getCodeQL(logger, config.codeQLCmd);
259259

260260
if (hasBadExpectErrorInput()) {
261261
throw new util.ConfigurationError(

‎src/autobuild-action.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ async function run({ startedAt, logger }: ActionState<["Base", "Logger"]>) {
9999
);
100100
}
101101

102-
const codeql = await getCodeQL(config.codeQLCmd);
102+
const codeql = await getCodeQL(logger, config.codeQLCmd);
103103

104104
languages = await determineAutobuildLanguages(codeql, config, logger);
105105
if (languages !== undefined) {

‎src/autobuild.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export async function runAutobuild(
155155
logger: Logger,
156156
) {
157157
logger.startGroup(`Attempting to automatically build ${language} code`);
158-
const codeQL = await getCodeQL(config.codeQLCmd);
158+
const codeQL = await getCodeQL(logger, config.codeQLCmd);
159159
if (language === BuiltInLanguage.cpp) {
160160
await setupCppAutobuild(codeQL, logger);
161161
}

0 commit comments

Comments
 (0)