Skip to content

Commit ec3cf9c

Browse files
edoardopirovanoedoardopirovano
authored
Merge pull request #1323 from github/update-v2.1.29-4b53723d
Merge main into releases/v2
2 parents cc7986c + f246f20 commit ec3cf9c

17 files changed

+16
-78
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CodeQL Action Changelog
22

3+
## 2.1.29 - 26 Oct 2022
4+
5+
- Update default CodeQL bundle version to 2.11.2. [#1320](https://github.com/github/codeql-action/pull/1320)
6+
37
## 2.1.28 - 18 Oct 2022
48

59
- Update default CodeQL bundle version to 2.11.1. [#1294](https://github.com/github/codeql-action/pull/1294)

‎lib/actions-util.js

-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/actions-util.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/defaults.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"bundleVersion": "codeql-bundle-20221010"
2+
"bundleVersion": "codeql-bundle-20221024"
33
}

‎lib/feature-flags.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.js

+1-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.test.js

-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.test.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node_modules/.package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "2.1.28",
3+
"version": "2.1.29",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

‎src/actions-util.ts

-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
getCodeQLDatabasePath,
1717
getRequiredEnvParam,
1818
GITHUB_DOTCOM_URL,
19-
isGitHubGhesVersionBelow,
2019
isHTTPError,
2120
isInTestMode,
2221
UserError,
@@ -749,14 +748,6 @@ const INCOMPATIBLE_MSG =
749748
export async function sendStatusReport<S extends StatusReportBase>(
750749
statusReport: S
751750
): Promise<boolean> {
752-
const gitHubVersion = await api.getGitHubVersionActionsOnly();
753-
if (isGitHubGhesVersionBelow(gitHubVersion, "3.2.0")) {
754-
// GHES 3.1 and earlier versions reject unexpected properties, which means
755-
// that they will reject status reports with newly added properties.
756-
// Inhibiting status reporting for GHES < 3.2 avoids such failures.
757-
return true;
758-
}
759-
760751
const statusReportJSON = JSON.stringify(statusReport);
761752
core.debug(`Sending status report: ${statusReportJSON}`);
762753
// If in test mode we don't want to upload the results

‎src/defaults.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"bundleVersion": "codeql-bundle-20221010"
2+
"bundleVersion": "codeql-bundle-20221024"
33
}

‎src/feature-flags.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const featureConfig: Record<
2626
},
2727
[Feature.CliConfigFileEnabled]: {
2828
envVar: "CODEQL_PASS_CONFIG_TO_CLI",
29-
minimumVersion: "2.10.1",
29+
minimumVersion: "2.11.1",
3030
},
3131
[Feature.GolangExtractionReconciliationEnabled]: {
3232
envVar: "CODEQL_GOLANG_EXTRACTION_RECONCILIATION",

‎src/util.test.ts

-27
Original file line numberDiff line numberDiff line change
@@ -365,33 +365,6 @@ for (const [packs, expectedStatus] of ML_POWERED_JS_STATUS_TESTS) {
365365
});
366366
}
367367

368-
test("isGitHubGhesVersionBelow", async (t) => {
369-
t.falsy(
370-
util.isGitHubGhesVersionBelow({ type: util.GitHubVariant.DOTCOM }, "3.2.0")
371-
);
372-
t.falsy(
373-
util.isGitHubGhesVersionBelow({ type: util.GitHubVariant.GHAE }, "3.2.0")
374-
);
375-
t.falsy(
376-
util.isGitHubGhesVersionBelow(
377-
{ type: util.GitHubVariant.GHES, version: "3.3.0" },
378-
"3.2.0"
379-
)
380-
);
381-
t.falsy(
382-
util.isGitHubGhesVersionBelow(
383-
{ type: util.GitHubVariant.GHES, version: "3.2.0" },
384-
"3.2.0"
385-
)
386-
);
387-
t.true(
388-
util.isGitHubGhesVersionBelow(
389-
{ type: util.GitHubVariant.GHES, version: "3.1.2" },
390-
"3.2.0"
391-
)
392-
);
393-
});
394-
395368
function formatGitHubVersion(version: util.GitHubVersion): string {
396369
switch (version.type) {
397370
case util.GitHubVariant.DOTCOM:

‎src/util.ts

-10
Original file line numberDiff line numberDiff line change
@@ -605,16 +605,6 @@ export function isHTTPError(arg: any): arg is HTTPError {
605605
return arg?.status !== undefined && Number.isInteger(arg.status);
606606
}
607607

608-
export function isGitHubGhesVersionBelow(
609-
gitHubVersion: GitHubVersion,
610-
expectedVersion: string
611-
): boolean {
612-
return (
613-
gitHubVersion.type === GitHubVariant.GHES &&
614-
semver.lt(gitHubVersion.version, expectedVersion)
615-
);
616-
}
617-
618608
let cachedCodeQlVersion: undefined | string = undefined;
619609

620610
export function cacheCodeQlVersion(version: string): void {

0 commit comments

Comments
 (0)