Skip to content

Commit aa2cb99

Browse files
committed
Merge remote-tracking branch 'origin/main' into mbg/improve-json-failures
2 parents b5f938c + a6ef2c9 commit aa2cb99

18 files changed

Lines changed: 97 additions & 110 deletions

‎.github/workflows/__rubocop-multi-language.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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+
- Update default CodeQL bundle version to [2.27.1](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.27.1). [#4160](https://github.com/github/codeql-action/pull/4160)
88

99
## 4.38.1 - 18 Sept 2026
1010

‎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.27.0",
3-
"cliVersion": "2.27.0",
4-
"priorBundleVersion": "codeql-bundle-v2.26.4",
5-
"priorCliVersion": "2.26.4"
2+
"bundleVersion": "codeql-bundle-v2.27.1",
3+
"cliVersion": "2.27.1",
4+
"priorBundleVersion": "codeql-bundle-v2.27.0",
5+
"priorCliVersion": "2.27.0"
66
}

‎lib/entry-points.js‎

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

‎package-lock.json‎

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

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"follow-redirects": "^1.16.0",
4040
"get-folder-size": "^5.0.0",
4141
"https-proxy-agent": "^7.0.6",
42-
"js-yaml": "^5.4.1",
42+
"js-yaml": "^5.4.2",
4343
"jsonschema": "1.5.0",
4444
"long": "^5.3.2",
4545
"node-forge": "^1.4.0",
@@ -66,7 +66,7 @@
6666
"eslint-import-resolver-typescript": "^4.4.5",
6767
"eslint-plugin-github": "^6.1.2",
6868
"eslint-plugin-import-x": "^4.17.1",
69-
"eslint-plugin-jsdoc": "^64.3.8",
69+
"eslint-plugin-jsdoc": "^64.5.2",
7070
"eslint-plugin-no-async-foreach": "^0.1.1",
7171
"glob": "^13.0.6",
7272
"globals": "^17.12.0",

‎pr-checks/changelog/validate.mts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,3 @@ export function isValidChangenoteFile(filename: string): boolean {
119119

120120
return isValid;
121121
}
122-
123-
/**
124-
* Validates the change-note files of the given list of file paths, ignoring ".gitkeep".
125-
* @param filepaths A list of filepaths to validate
126-
* @returns True if all the paths are valid, false otherwise.
127-
*/
128-
export function isValidAllChangenoteFiles(filepaths: string[]): boolean {
129-
return filepaths
130-
.filter((f) => f !== ".gitkeep")
131-
.reduce((r, filePath) => r && isValidChangenoteFile(filePath), true);
132-
}

‎pr-checks/changelog/validate.test.mts‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import assert from "node:assert/strict";
2-
import * as fs from "node:fs";
3-
import * as path from "node:path";
42
import { describe, it } from "node:test";
53

6-
import { withTmpDir, withTmpFile } from "../../src/util";
4+
import { withTmpFile } from "../../src/util";
75

86
import {
97
hasValidChangenoteCategory,
10-
isValidAllChangenoteFiles,
118
isValidChangenoteContent,
129
isValidChangenoteFile,
1310
isValidChangenoteFilename,
@@ -187,39 +184,3 @@ await describe("isValidChangenoteFile", async () => {
187184
);
188185
});
189186
});
190-
191-
await describe("isValidAllChangenoteFiles", async () => {
192-
await it("accepts list of file paths of valid change-notes", async () => {
193-
await withTmpDir(async (tmpDir) => {
194-
const fileName1 = path.join(tmpDir, "2026-01-01-fix-bug.md");
195-
const fileName2 = path.join(tmpDir, "2026-01-02-add-feature.md");
196-
fs.writeFileSync(fileName1, "---\ncategory: fix\n---\n- Fixed a bug\n");
197-
fs.writeFileSync(
198-
fileName2,
199-
"---\ncategory: feature\n---\n- Added a feature\n",
200-
);
201-
assert.equal(isValidAllChangenoteFiles([fileName1, fileName2]), true);
202-
});
203-
});
204-
205-
await it("accepts the empty list", async () => {
206-
assert.equal(isValidAllChangenoteFiles([]), true);
207-
});
208-
209-
await it("accepts list of .gitkeep", async () => {
210-
assert.equal(isValidAllChangenoteFiles([".gitkeep"]), true);
211-
});
212-
213-
await it("rejects list containing a file path to an invalid change-note", async () => {
214-
await withTmpDir(async (tmpDir) => {
215-
const fileName1 = path.join(tmpDir, "2026-01-01-fix-bug.md");
216-
const fileName2 = path.join(tmpDir, "2026-01-02-wrong-category.md");
217-
fs.writeFileSync(fileName1, "---\ncategory: fix\n---\n- Fixed a bug\n");
218-
fs.writeFileSync(
219-
fileName2,
220-
"---\ncategory: foobar\n---\n- Added a feature\n",
221-
);
222-
assert.equal(isValidAllChangenoteFiles([fileName1, fileName2]), false);
223-
});
224-
});
225-
});

‎pr-checks/changenotes.mts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
renderChangelog,
1515
withChangelog,
1616
} from "./changelog";
17-
import { isValidAllChangenoteFiles } from "./changelog/validate.mjs";
17+
import { isValidChangenoteFile } from "./changelog/validate.mjs";
1818
import { CHANGENOTES_DIR } from "./config";
1919

2020
/**
@@ -116,7 +116,11 @@ function assemble(): ExitCode {
116116

117117
function validate(): ExitCode {
118118
try {
119-
if (isValidAllChangenoteFiles(fs.readdirSync(CHANGENOTES_DIR))) {
119+
const allChangenotesValid = getChangenotes().reduce(
120+
(r, changenote) => r && isValidChangenoteFile(changenote.absolutePath),
121+
true,
122+
);
123+
if (allChangenotesValid) {
120124
console.log(`All changenotes in '${CHANGENOTES_DIR}' are valid.`);
121125
return ExitCode.Success;
122126
}

‎pr-checks/checks/rubocop-multi-language.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ versions:
55
- default
66
steps:
77
- name: Set up Ruby
8-
uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
8+
uses: ruby/setup-ruby@984c0c890880bbf811283d6f09c4607c62d210a4 # v1.323.0
99
with:
1010
ruby-version: 2.6
1111
- name: Install Code Scanning integration

0 commit comments

Comments
 (0)