Merge pull request #1323 from github/update-v2.1.29-4b53723d

Merge main into releases/v2
github · Oct 26, 2022 · ec3cf9c · ec3cf9c
2 parents cc7986c + f246f20
commit ec3cf9c
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 78 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CodeQL Action Changelog
 
+## 2.1.29 - 26 Oct 2022
+
+- Update default CodeQL bundle version to 2.11.2. [#1320](https://github.com/github/codeql-action/pull/1320)
+
 ## 2.1.28 - 18 Oct 2022
 
 - Update default CodeQL bundle version to 2.11.1. [#1294](https://github.com/github/codeql-action/pull/1294)

diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20221010"
+    "bundleVersion": "codeql-bundle-20221024"
 }
diff --git a/lib/feature-flags.js b/lib/feature-flags.js
diff --git a/lib/util.js b/lib/util.js
diff --git a/lib/util.js.map b/lib/util.js.map
diff --git a/lib/util.test.js b/lib/util.test.js
diff --git a/lib/util.test.js.map b/lib/util.test.js.map
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "2.1.28",
+  "version": "2.1.29",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

diff --git a/src/actions-util.ts b/src/actions-util.ts
@@ -16,7 +16,6 @@ import {
   getCodeQLDatabasePath,
   getRequiredEnvParam,
   GITHUB_DOTCOM_URL,
-  isGitHubGhesVersionBelow,
   isHTTPError,
   isInTestMode,
   UserError,
@@ -749,14 +748,6 @@ const INCOMPATIBLE_MSG =
 export async function sendStatusReport<S extends StatusReportBase>(
   statusReport: S
 ): Promise<boolean> {
-  const gitHubVersion = await api.getGitHubVersionActionsOnly();
-  if (isGitHubGhesVersionBelow(gitHubVersion, "3.2.0")) {
-    // GHES 3.1 and earlier versions reject unexpected properties, which means
-    // that they will reject status reports with newly added properties.
-    // Inhibiting status reporting for GHES < 3.2 avoids such failures.
-    return true;
-  }
-
   const statusReportJSON = JSON.stringify(statusReport);
   core.debug(`Sending status report: ${statusReportJSON}`);
   // If in test mode we don't want to upload the results

diff --git a/src/defaults.json b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-  "bundleVersion": "codeql-bundle-20221010"
+  "bundleVersion": "codeql-bundle-20221024"
 }
diff --git a/src/feature-flags.ts b/src/feature-flags.ts
@@ -26,7 +26,7 @@ export const featureConfig: Record<
   },
   [Feature.CliConfigFileEnabled]: {
     envVar: "CODEQL_PASS_CONFIG_TO_CLI",
-    minimumVersion: "2.10.1",
+    minimumVersion: "2.11.1",
   },
   [Feature.GolangExtractionReconciliationEnabled]: {
     envVar: "CODEQL_GOLANG_EXTRACTION_RECONCILIATION",

diff --git a/src/util.test.ts b/src/util.test.ts
@@ -365,33 +365,6 @@ for (const [packs, expectedStatus] of ML_POWERED_JS_STATUS_TESTS) {
   });
 }
 
-test("isGitHubGhesVersionBelow", async (t) => {
-  t.falsy(
-    util.isGitHubGhesVersionBelow({ type: util.GitHubVariant.DOTCOM }, "3.2.0")
-  );
-  t.falsy(
-    util.isGitHubGhesVersionBelow({ type: util.GitHubVariant.GHAE }, "3.2.0")
-  );
-  t.falsy(
-    util.isGitHubGhesVersionBelow(
-      { type: util.GitHubVariant.GHES, version: "3.3.0" },
-      "3.2.0"
-    )
-  );
-  t.falsy(
-    util.isGitHubGhesVersionBelow(
-      { type: util.GitHubVariant.GHES, version: "3.2.0" },
-      "3.2.0"
-    )
-  );
-  t.true(
-    util.isGitHubGhesVersionBelow(
-      { type: util.GitHubVariant.GHES, version: "3.1.2" },
-      "3.2.0"
-    )
-  );
-});
-
 function formatGitHubVersion(version: util.GitHubVersion): string {
   switch (version.type) {
     case util.GitHubVariant.DOTCOM:

diff --git a/src/util.ts b/src/util.ts
@@ -605,16 +605,6 @@ export function isHTTPError(arg: any): arg is HTTPError {
   return arg?.status !== undefined && Number.isInteger(arg.status);
 }
 
-export function isGitHubGhesVersionBelow(
-  gitHubVersion: GitHubVersion,
-  expectedVersion: string
-): boolean {
-  return (
-    gitHubVersion.type === GitHubVariant.GHES &&
-    semver.lt(gitHubVersion.version, expectedVersion)
-  );
-}
-
 let cachedCodeQlVersion: undefined | string = undefined;
 
 export function cacheCodeQlVersion(version: string): void {