Skip to content

Commit d37931a

Browse files
committed
Merge remote-tracking branch 'origin/main' into dbartol/use-real-actions-extractor
2 parents 85e30fe + 4b35b04 commit d37931a

8 files changed

+24
-6
lines changed

Diff for: .github/workflows/post-release-mergeback.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
--draft
169169
170170
- name: Generate token
171-
uses: actions/[email protected].5
171+
uses: actions/[email protected].6
172172
id: app-token
173173
with:
174174
app-id: ${{ vars.AUTOMATION_APP_ID }}

Diff for: .github/workflows/update-release-branch.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
pull-requests: write # needed to create pull request
125125
steps:
126126
- name: Generate token
127-
uses: actions/[email protected].5
127+
uses: actions/[email protected].6
128128
id: app-token
129129
with:
130130
app-id: ${{ vars.AUTOMATION_APP_ID }}

Diff for: lib/cli-errors.js

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: lib/cli-errors.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: lib/codeql.js

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: lib/codeql.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: src/cli-errors.ts

+4
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ function extractAutobuildErrors(error: string): string | undefined {
119119
/** Error messages from the CLI that we consider configuration errors and handle specially. */
120120
export enum CliConfigErrorCategory {
121121
AutobuildError = "AutobuildError",
122+
CouldNotCreateTempDir = "CouldNotCreateTempDir",
122123
ExternalRepositoryCloneFailed = "ExternalRepositoryCloneFailed",
123124
GradleBuildFailed = "GradleBuildFailed",
124125
IncompatibleWithActionVersion = "IncompatibleWithActionVersion",
@@ -159,6 +160,9 @@ export const cliErrorsConfig: Record<
159160
new RegExp("We were unable to automatically build your code"),
160161
],
161162
},
163+
[CliConfigErrorCategory.CouldNotCreateTempDir]: {
164+
cliErrorMessageCandidates: [new RegExp("Could not create temp directory")],
165+
},
162166
[CliConfigErrorCategory.ExternalRepositoryCloneFailed]: {
163167
cliErrorMessageCandidates: [
164168
new RegExp("Failed to clone external Git repository"),

Diff for: src/codeql.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,13 @@ export async function setupCodeQL(
377377
zstdAvailability,
378378
};
379379
} catch (e) {
380-
throw new Error(
380+
const ErrorClass =
381+
e instanceof util.ConfigurationError ||
382+
(e instanceof Error && e.message.includes("ENOSPC")) // out of disk space
383+
? util.ConfigurationError
384+
: Error;
385+
386+
throw new ErrorClass(
381387
`Unable to download and extract CodeQL CLI: ${getErrorMessage(e)}${
382388
e instanceof Error && e.stack ? `\n\nDetails: ${e.stack}` : ""
383389
}`,

0 commit comments

Comments
 (0)