Merge branch 'main' into nickfyson/speculative-script-fix

github · Apr 16, 2024 · 71e6077 · 71e6077
2 parents f2c09fb + b8e2556
commit 71e6077
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
 
 ## [UNRELEASED]
 
+No user facing changes.
+
+## 3.25.0 - 15 Apr 2024
+
 - The deprecated feature for extracting dependencies for a Python analysis has been removed. [#2224](https://github.com/github/codeql-action/pull/2224)
 
   As a result, the following inputs and environment variables are now ignored:

diff --git a/lib/api-client.js b/lib/api-client.js
diff --git a/lib/api-client.js.map b/lib/api-client.js.map
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
diff --git a/lib/upload-lib.js.map b/lib/upload-lib.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": "3.25.0",
+  "version": "3.25.1",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

diff --git a/src/api-client.ts b/src/api-client.ts
@@ -199,6 +199,7 @@ export function wrapApiConfigurationError(e: unknown) {
   if (isHTTPError(e)) {
     if (
       e.message.includes("API rate limit exceeded for site ID installation") ||
+      e.message.includes("commit not found") ||
       /^ref .* not found in this repository$/.test(e.message)
     ) {
       return new ConfigurationError(e.message);

diff --git a/src/upload-lib.ts b/src/upload-lib.ts
@@ -320,14 +320,16 @@ export async function uploadFromActions(
 
 function getSarifFilePaths(sarifPath: string) {
   if (!fs.existsSync(sarifPath)) {
-    throw new InvalidSarifUploadError(`Path does not exist: ${sarifPath}`);
+    // This is always a configuration error, even for first-party runs.
+    throw new ConfigurationError(`Path does not exist: ${sarifPath}`);
   }
 
   let sarifFiles: string[];
   if (fs.lstatSync(sarifPath).isDirectory()) {
     sarifFiles = findSarifFilesInDir(sarifPath);
     if (sarifFiles.length === 0) {
-      throw new InvalidSarifUploadError(
+      // This is always a configuration error, even for first-party runs.
+      throw new ConfigurationError(
         `No SARIF files found to upload in "${sarifPath}".`,
       );
     }
@@ -733,7 +735,8 @@ export function validateUniqueCategory(sarif: SarifFile): void {
   for (const [category, { id, tool }] of Object.entries(categories)) {
     const sentinelEnvVar = `CODEQL_UPLOAD_SARIF_${category}`;
     if (process.env[sentinelEnvVar]) {
-      throw new InvalidSarifUploadError(
+      // This is always a configuration error, even for first-party runs.
+      throw new ConfigurationError(
         "Aborting upload: only one run of the codeql/analyze or codeql/upload-sarif actions is allowed per job per tool/category. " +
           "The easiest fix is to specify a unique value for the `category` input. If .runs[].automationDetails.id is specified " +
           "in the sarif file, that will take precedence over your configured `category`. " +