Merge remote-tracking branch 'origin/main' into dbartol/use-real-acti…

…ons-extractor
github · Mar 3, 2025 · d37931a · d37931a
2 parents 85e30fe + 4b35b04
commit d37931a
Showing 8 changed files with 24 additions and 6 deletions.
diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml
@@ -168,7 +168,7 @@ jobs:
             --draft
 
       - name: Generate token
-        uses: actions/create-github-app-token@v1.11.5
+        uses: actions/create-github-app-token@v1.11.6
         id: app-token
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}

diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml
@@ -124,7 +124,7 @@ jobs:
       pull-requests: write # needed to create pull request
     steps:
     - name: Generate token
-      uses: actions/create-github-app-token@v1.11.5
+      uses: actions/create-github-app-token@v1.11.6
       id: app-token
       with:
         app-id: ${{ vars.AUTOMATION_APP_ID }}

diff --git a/lib/cli-errors.js b/lib/cli-errors.js
diff --git a/lib/cli-errors.js.map b/lib/cli-errors.js.map
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/src/cli-errors.ts b/src/cli-errors.ts
@@ -119,6 +119,7 @@ function extractAutobuildErrors(error: string): string | undefined {
 /** Error messages from the CLI that we consider configuration errors and handle specially. */
 export enum CliConfigErrorCategory {
   AutobuildError = "AutobuildError",
+  CouldNotCreateTempDir = "CouldNotCreateTempDir",
   ExternalRepositoryCloneFailed = "ExternalRepositoryCloneFailed",
   GradleBuildFailed = "GradleBuildFailed",
   IncompatibleWithActionVersion = "IncompatibleWithActionVersion",
@@ -159,6 +160,9 @@ export const cliErrorsConfig: Record<
       new RegExp("We were unable to automatically build your code"),
     ],
   },
+  [CliConfigErrorCategory.CouldNotCreateTempDir]: {
+    cliErrorMessageCandidates: [new RegExp("Could not create temp directory")],
+  },
   [CliConfigErrorCategory.ExternalRepositoryCloneFailed]: {
     cliErrorMessageCandidates: [
       new RegExp("Failed to clone external Git repository"),

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -377,7 +377,13 @@ export async function setupCodeQL(
       zstdAvailability,
     };
   } catch (e) {
-    throw new Error(
+    const ErrorClass =
+      e instanceof util.ConfigurationError ||
+      (e instanceof Error && e.message.includes("ENOSPC")) // out of disk space
+        ? util.ConfigurationError
+        : Error;
+
+    throw new ErrorClass(
       `Unable to download and extract CodeQL CLI: ${getErrorMessage(e)}${
         e instanceof Error && e.stack ? `\n\nDetails: ${e.stack}` : ""
       }`,