Skip to content

Commit 81d8502

Browse files
committed
Merge branch 'main' of https://github.com/danger/danger-js
2 parents 874014f + ef8d604 commit 81d8502

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
## Main
1616

1717
<!-- Your comment below this -->
18+
- Clear missing DSL timeout when DSL is found so danger runner can exit faster when done [@normano64]
1819
<!-- Your comment above this -->
1920

2021
## 11.3.1

Diff for: source/commands/danger-runner.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const run = (config: SharedCLI) => async (jsonString: string) => {
5151

5252
d("Got STDIN for Danger Run")
5353
foundDSL = true
54+
clearTimeout(missingDSLTimeout)
5455
const dangerFile = dangerfilePath(program)
5556

5657
// Set up the runtime env
@@ -85,9 +86,9 @@ nodeCleanup((exitCode: number, signal: string) => {
8586
})
8687

8788
// Add a timeout so that CI doesn't run forever if something has broken.
88-
setTimeout(() => {
89+
const missingDSLTimeout = setTimeout(() => {
8990
if (!foundDSL) {
90-
console.error(chalk.red("Timeout: Failed to get the Danger DSL after 1 second"))
91+
console.error(chalk.red("Timeout: Failed to get the Danger DSL after 10 second"))
9192
process.exitCode = 1
9293
process.exit(1)
9394
}

0 commit comments

Comments
 (0)