Merge branch 'main' into essen-updates

mikeessen · web-flow · commit a6b6e2b7f622 · 2024-08-20T07:17:18.000-04:00
diff --git a/.buildbot/Jenkinsfile b/.buildbot/Jenkinsfile
@@ -26,6 +26,7 @@ def call() {
       skipDefaultCheckout()
       buildDiscarder(logRotator(numToKeepStr:'1000'))
       ansiColor('xterm')
+      timeout(time: 6, unit: 'HOURS')
     }
 
     agent {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ def call() {`
`26`	`26`	`skipDefaultCheckout()`
`27`	`27`	`buildDiscarder(logRotator(numToKeepStr:'1000'))`
`28`	`28`	`ansiColor('xterm')`
	`29`	`+ timeout(time: 6, unit: 'HOURS')`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`agent {`