ci github int tests settle (#459)
* ci: Allow more time for GitHub tests to settle * ci: Run build-snapshot on any push, but dont dupe with PR
This commit is contained in:
parent
2950b59514
commit
ee26fe6b50
|
|
@ -4,8 +4,6 @@ name: "Build Snapshot"
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
pull_request:
|
|
||||||
branches: [main]
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-snapshot:
|
build-snapshot:
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,8 @@ class OliveTinTestRunnerStartLocalProcess extends OliveTinTestRunner {
|
||||||
let stdout = ""
|
let stdout = ""
|
||||||
let stderr = ""
|
let stderr = ""
|
||||||
|
|
||||||
|
console.log(" OliveTin starting local process...")
|
||||||
|
|
||||||
this.ot = spawn('./../OliveTin', ['-configdir', 'configs/' + cfg + '/'])
|
this.ot = spawn('./../OliveTin', ['-configdir', 'configs/' + cfg + '/'])
|
||||||
|
|
||||||
let logStdout = false
|
let logStdout = false
|
||||||
|
|
@ -74,6 +76,8 @@ class OliveTinTestRunnerStartLocalProcess extends OliveTinTestRunner {
|
||||||
if (this.ot.exitCode == null) {
|
if (this.ot.exitCode == null) {
|
||||||
this.BASE_URL = 'http://localhost:1337/'
|
this.BASE_URL = 'http://localhost:1337/'
|
||||||
|
|
||||||
|
console.log(" OliveTin waiting for local process to start...")
|
||||||
|
|
||||||
await waitOn({
|
await waitOn({
|
||||||
resources: [this.BASE_URL]
|
resources: [this.BASE_URL]
|
||||||
})
|
})
|
||||||
|
|
@ -95,7 +99,12 @@ class OliveTinTestRunnerStartLocalProcess extends OliveTinTestRunner {
|
||||||
console.log(" OliveTin local process killed")
|
console.log(" OliveTin local process killed")
|
||||||
}
|
}
|
||||||
|
|
||||||
await new Promise((res) => setTimeout(res, 100))
|
if (process.env.CI === 'true') {
|
||||||
|
// GitHub runners seem to need a bit more time to clean up
|
||||||
|
await new Promise((res) => setTimeout(res, 3000))
|
||||||
|
} else {
|
||||||
|
await new Promise((res) => setTimeout(res, 100))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue