Merge branch 'ci-tests' into signal-shutdown

This commit is contained in:
imbolc 2022-07-13 16:58:07 +03:00
commit 79288e8b8d
2 changed files with 3 additions and 5 deletions

View file

@ -54,7 +54,6 @@ jobs:
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: "1"
GITHUB_ACTIONS: "1"
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
@ -77,7 +76,6 @@ jobs:
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: "1"
GITHUB_ACTIONS: "1"
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1

View file

@ -371,12 +371,12 @@ mod tests {
registry.runner(pool).run().await.unwrap()
}
fn is_github_actions() -> bool {
std::env::var("GITHUB_ACTIONS").ok().is_some()
fn is_ci() -> bool {
std::env::var("CI").ok().is_some()
}
fn default_pause() -> u64 {
if is_github_actions() {
if is_ci() {
1000
} else {
200