Merge branch 'main' into henrymercer/extract-direct-to-toolcache

src/codeql.test.ts

@@ -811,8 +811,8 @@ for (const {
     flagPassed
       ? "--new-analysis-summary"
       : negativeFlagPassed
-      ? "--no-new-analysis-summary"
-      : "nothing"
+        ? "--no-new-analysis-summary"
+        : "nothing"
   } for CodeQL version ${JSON.stringify(codeqlVersion)} and ${
     util.GitHubVariant[githubVersion.type]
   } ${githubVersion.version ? ` ${githubVersion.version}` : ""}`, async (t) => {

src/config-utils.ts

@@ -652,7 +652,7 @@ function parseQueriesFromInput(
 
   const trimmedInput = queriesInputCombines
     ? rawQueriesInput.trim().slice(1).trim()
-    : rawQueriesInput?.trim() ?? "";
+    : (rawQueriesInput?.trim() ?? "");
   if (queriesInputCombines && trimmedInput.length === 0) {
     throw new ConfigurationError(
       getConfigFilePropertyError(

src/feature-flags.ts

@@ -95,7 +95,7 @@ export const featureConfig: Record<
   }
 > = {
   [Feature.ArtifactV4Upgrade]: {
-    defaultValue: false,
+    defaultValue: true,
     envVar: "CODEQL_ACTION_ARTIFACT_V4_UPGRADE",
     minimumVersion: undefined,
   },

src/start-proxy-action.ts

@@ -235,8 +235,8 @@ async function getProxyBinaryPath(): Promise<string> {
     process.platform === "win32"
       ? "win64"
       : process.platform === "darwin"
-      ? "osx64"
-      : "linux64";
+        ? "osx64"
+        : "linux64";
   const proxyPackage = `${UPDATEJOB_PROXY}-${platform}.tar.gz`;
   const proxyURL = `${UPDATEJOB_PROXY_URL_PREFIX}${proxyPackage}`;
 

src/testing-utils.ts

@@ -286,8 +286,8 @@ export function mockBundleDownloadApi({
     process.platform === "win32"
       ? "win64"
       : process.platform === "linux"
-      ? "linux64"
-      : "osx64";
+        ? "linux64"
+        : "osx64";
 
   const baseUrl = apiDetails?.url ?? "https://example.com";
 

src/tracer-config.test.ts

@@ -44,8 +44,8 @@ test("getCombinedTracerConfig - with start-tracing.json environment file", async
       process.platform === "win32"
         ? "win64"
         : process.platform === "darwin"
-        ? "osx64"
-        : "linux64";
+          ? "osx64"
+          : "linux64";
     const startTracingEnv = {
       foo: "bar",
       CODEQL_DIST: bundlePath,
@@ -104,8 +104,8 @@ test("getCombinedTracerConfig - with SetsCodeqlRunnerEnvVar feature enabled in C
       process.platform === "win32"
         ? "win64"
         : process.platform === "darwin"
-        ? "osx64"
-        : "linux64";
+          ? "osx64"
+          : "linux64";
     const startTracingEnv = {
       foo: "bar",
       CODEQL_DIST: bundlePath,

src/upload-lib.test.ts

@@ -50,9 +50,8 @@ test("validate correct payload used for push, PR merge commit, and PR head", asy
   process.env["GITHUB_EVENT_NAME"] = "pull_request";
   process.env["GITHUB_SHA"] = "commit";
   process.env["GITHUB_BASE_REF"] = "master";
-  process.env[
-    "GITHUB_EVENT_PATH"
-  ] = `${__dirname}/../src/testdata/pull_request.json`;
+  process.env["GITHUB_EVENT_PATH"] =
+    `${__dirname}/../src/testdata/pull_request.json`;
   const prMergePayload: any = uploadLib.buildPayload(
     "commit",
     "refs/pull/123/merge",

src/upload-lib.ts

@@ -717,8 +717,8 @@ export async function waitForProcessing(
         throw shouldConsiderConfigurationError(processingErrors)
           ? new ConfigurationError(message)
           : shouldConsiderInvalidRequest(processingErrors)
-          ? new InvalidSarifUploadError(message)
-          : new Error(message);
+            ? new InvalidSarifUploadError(message)
+            : new Error(message);
       } else {
         util.assertNever(status);
       }