Merge pull request #2628 from github/update-v3.27.6-af49565b8

Merge main into releases/v3

CHANGELOG.md

@@ -4,7 +4,11 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.
 
-## [UNRELEASED]
+## 3.27.6 - 03 Dec 2024
+
+- Update default CodeQL bundle version to 2.19.4. [#2626](https://github.com/github/codeql-action/pull/2626)
+
+## 3.27.5 - 19 Nov 2024
 
 No user facing changes.
 

lib/analyze.js

@@ -287,7 +287,7 @@ extensions:
     data:
 `;
     let data = ranges
-        .map((range) => `      - ["${range[0]}", ${range[1]}, ${range[2]}]\n`)
+        .map((range) => `      - ["${range.path}", ${range.startLine}, ${range.endLine}]\n`)
         .join("");
     if (!data) {
         // Ensure that the data extension is not empty, so that a pull request with

lib/api-compatibility.json

@@ -1 +1 @@
-{ "maximumVersion": "3.15", "minimumVersion": "3.11" }
+{ "maximumVersion": "3.16", "minimumVersion": "3.11" }

lib/defaults.json

@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.19.3",
+    "bundleVersion": "codeql-bundle-v2.19.4",
-    "cliVersion": "2.19.3",
+    "cliVersion": "2.19.4",
-    "priorBundleVersion": "codeql-bundle-v2.19.2",
+    "priorBundleVersion": "codeql-bundle-v2.19.3",
-    "priorCliVersion": "2.19.2"
+    "priorCliVersion": "2.19.3"
 }

lib/start-proxy-action.js

@@ -32,8 +32,8 @@ const actionsUtil = __importStar(require("./actions-util"));
 const logging_1 = require("./logging");
 const util = __importStar(require("./util"));
 const UPDATEJOB_PROXY = "update-job-proxy";
-const UPDATEJOB_PROXY_VERSION = "v2.0.20240722180912";
+const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
-const UPDATEJOB_PROXY_URL = "https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/update-job-proxy.tar.gz";
+const UPDATEJOB_PROXY_URL_PREFIX = "https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/";
 const PROXY_USER = "proxy_user";
 const KEY_SIZE = 2048;
 const KEY_EXPIRY_YEARS = 2;
@@ -196,13 +196,21 @@ function getProxyAuth() {
     return;
 }
 async function getProxyBinaryPath() {
-    let proxyBin = toolcache.find(UPDATEJOB_PROXY, UPDATEJOB_PROXY_VERSION);
+    const proxyFileName = process.platform === "win32" ? `${UPDATEJOB_PROXY}.exe` : UPDATEJOB_PROXY;
+    const platform = process.platform === "win32"
+        ? "win64"
+        : process.platform === "darwin"
+            ? "osx64"
+            : "linux64";
+    const proxyPackage = `${UPDATEJOB_PROXY}-${platform}.tar.gz`;
+    const proxyURL = `${UPDATEJOB_PROXY_URL_PREFIX}${proxyPackage}`;
+    let proxyBin = toolcache.find(proxyFileName, UPDATEJOB_PROXY_VERSION);
     if (!proxyBin) {
-        const temp = await toolcache.downloadTool(UPDATEJOB_PROXY_URL);
+        const temp = await toolcache.downloadTool(proxyURL);
         const extracted = await toolcache.extractTar(temp);
-        proxyBin = await toolcache.cacheDir(extracted, UPDATEJOB_PROXY, UPDATEJOB_PROXY_VERSION);
+        proxyBin = await toolcache.cacheDir(extracted, proxyFileName, UPDATEJOB_PROXY_VERSION);
     }
-    proxyBin = path.join(proxyBin, UPDATEJOB_PROXY);
+    proxyBin = path.join(proxyBin, proxyFileName);
     return proxyBin;
 }
 function credentialToStr(c) {

node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.27.5",
+  "version": "3.27.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "3.27.5",
+  "version": "3.27.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "3.27.5",
+      "version": "3.27.6",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^2.1.9",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.27.5",
+  "version": "3.27.6",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

src/analyze.ts

@@ -428,7 +428,10 @@ extensions:
 `;
 
   let data = ranges
-    .map((range) => `      - ["${range[0]}", ${range[1]}, ${range[2]}]\n`)
+    .map(
+      (range) =>
+        `      - ["${range.path}", ${range.startLine}, ${range.endLine}]\n`,
+    )
     .join("");
   if (!data) {
     // Ensure that the data extension is not empty, so that a pull request with

src/api-compatibility.json

@@ -1 +1 @@
-{"maximumVersion": "3.15", "minimumVersion": "3.11"}
+{"maximumVersion": "3.16", "minimumVersion": "3.11"}

src/defaults.json

@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.19.3",
+  "bundleVersion": "codeql-bundle-v2.19.4",
-  "cliVersion": "2.19.3",
+  "cliVersion": "2.19.4",
-  "priorBundleVersion": "codeql-bundle-v2.19.2",
+  "priorBundleVersion": "codeql-bundle-v2.19.3",
-  "priorCliVersion": "2.19.2"
+  "priorCliVersion": "2.19.3"
 }

src/start-proxy-action.ts

@@ -10,9 +10,9 @@ import { getActionsLogger, Logger } from "./logging";
 import * as util from "./util";
 
 const UPDATEJOB_PROXY = "update-job-proxy";
-const UPDATEJOB_PROXY_VERSION = "v2.0.20240722180912";
+const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
-const UPDATEJOB_PROXY_URL =
+const UPDATEJOB_PROXY_URL_PREFIX =
-  "https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/update-job-proxy.tar.gz";
+  "https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/";
 const PROXY_USER = "proxy_user";
 const KEY_SIZE = 2048;
 const KEY_EXPIRY_YEARS = 2;
@@ -229,17 +229,28 @@ function getProxyAuth(): BasicAuthCredentials | undefined {
 }
 
 async function getProxyBinaryPath(): Promise<string> {
-  let proxyBin = toolcache.find(UPDATEJOB_PROXY, UPDATEJOB_PROXY_VERSION);
+  const proxyFileName =
+    process.platform === "win32" ? `${UPDATEJOB_PROXY}.exe` : UPDATEJOB_PROXY;
+  const platform =
+    process.platform === "win32"
+      ? "win64"
+      : process.platform === "darwin"
+      ? "osx64"
+      : "linux64";
+  const proxyPackage = `${UPDATEJOB_PROXY}-${platform}.tar.gz`;
+  const proxyURL = `${UPDATEJOB_PROXY_URL_PREFIX}${proxyPackage}`;
+
+  let proxyBin = toolcache.find(proxyFileName, UPDATEJOB_PROXY_VERSION);
   if (!proxyBin) {
-    const temp = await toolcache.downloadTool(UPDATEJOB_PROXY_URL);
+    const temp = await toolcache.downloadTool(proxyURL);
     const extracted = await toolcache.extractTar(temp);
     proxyBin = await toolcache.cacheDir(
       extracted,
-      UPDATEJOB_PROXY,
+      proxyFileName,
       UPDATEJOB_PROXY_VERSION,
     );
   }
-  proxyBin = path.join(proxyBin, UPDATEJOB_PROXY);
+  proxyBin = path.join(proxyBin, proxyFileName);
   return proxyBin;
 }