Skip to content

Commit 4173a29

Browse files
committed
Set the bench timeout to 20min
Apparently criterion takes this long to build on my circleci workers these days /: This requires antifuchs/cargo-template-ci#12 on cargo template-ci
1 parent ccea374 commit 4173a29

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.circleci/config.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TemplateCIConfig { bench: BenchEntry(MatrixEntry { run: true, run_cron: false, version: "stable", install_commandline: None, commandline: "cargo bench" }), clippy: ClippyEntry(MatrixEntry { run: true, run_cron: false, version: "stable", install_commandline: Some("rustup component add clippy"), commandline: "cargo clippy -- -D warnings" }), rustfmt: RustfmtEntry(MatrixEntry { run: true, run_cron: false, version: "stable", install_commandline: Some("rustup component add rustfmt"), commandline: "cargo fmt -v -- --check" }), additional_matrix_entries: {"no_std_stable": CustomEntry(MatrixEntry { run: true, run_cron: false, version: "stable", install_commandline: None, commandline: "cargo test --no-default-features --features no_std" }), "no_std_nightly": CustomEntry(MatrixEntry { run: true, run_cron: false, version: "nightly", install_commandline: None, commandline: "cargo +nightly test --no-default-features --features no_std" })}, cache: "cargo", os: "linux", dist: "xenial", versions: ["stable", "nightly"], test_commandline: "cargo test --verbose --all", scheduled_test_branches: ["master"], test_schedule: "0 0 * * 0" }
1+
# TemplateCIConfig { bench: BenchEntry(MatrixEntry { run: true, run_cron: false, version: "stable", install_commandline: None, commandline: "cargo bench", timeout: Some(1200s) }), clippy: ClippyEntry(MatrixEntry { run: true, run_cron: false, version: "stable", install_commandline: Some("rustup component add clippy"), commandline: "cargo clippy -- -D warnings", timeout: None }), rustfmt: RustfmtEntry(MatrixEntry { run: true, run_cron: false, version: "stable", install_commandline: Some("rustup component add rustfmt"), commandline: "cargo fmt -v -- --check", timeout: None }), additional_matrix_entries: {"no_std_nightly": CustomEntry(MatrixEntry { run: true, run_cron: false, version: "nightly", install_commandline: None, commandline: "cargo +nightly test --no-default-features --features no_std", timeout: None }), "no_std_stable": CustomEntry(MatrixEntry { run: true, run_cron: false, version: "stable", install_commandline: None, commandline: "cargo test --no-default-features --features no_std", timeout: None })}, cache: "cargo", os: "linux", dist: "xenial", versions: ["stable", "nightly"], test_commandline: "cargo test --verbose --all", scheduled_test_branches: ["master"], test_schedule: "0 0 * * 0" }
22
version: "2.1"
33

44
executors:
@@ -78,7 +78,8 @@ jobs:
7878
- run:
7979
name: Bench
8080
command: cargo bench
81-
no_std_stable:
81+
no_output_timeout: 1200s
82+
no_std_nightly:
8283
parameters:
8384
version:
8485
type: executor
@@ -90,9 +91,9 @@ jobs:
9091
steps:
9192
- checkout
9293
- run:
93-
name: cargo test --no-default-features --features no_std
94-
command: cargo test --no-default-features --features no_std
95-
no_std_nightly:
94+
name: cargo +nightly test --no-default-features --features no_std
95+
command: cargo +nightly test --no-default-features --features no_std
96+
no_std_stable:
9697
parameters:
9798
version:
9899
type: executor
@@ -104,8 +105,8 @@ jobs:
104105
steps:
105106
- checkout
106107
- run:
107-
name: cargo +nightly test --no-default-features --features no_std
108-
command: cargo +nightly test --no-default-features --features no_std
108+
name: cargo test --no-default-features --features no_std
109+
command: cargo test --no-default-features --features no_std
109110

110111
ci_success:
111112
docker:
@@ -192,23 +193,23 @@ workflows:
192193
]
193194
}
194195
}
195-
- no_std_stable:
196-
name: "no_std_stable"
197-
version: stable
198-
version_name: stable
199196
- no_std_nightly:
200197
name: "no_std_nightly"
201198
version: nightly
202199
version_name: nightly
200+
- no_std_stable:
201+
name: "no_std_stable"
202+
version: stable
203+
version_name: stable
203204
- ci_success:
204205
requires:
205206
- test-stable
206207
- test-nightly
207208
- rustfmt
208209
- clippy
209210
- bench
210-
- no_std_stable
211211
- no_std_nightly
212+
- no_std_stable
212213
scheduled_tests:
213214
jobs:
214215
- test:

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dev-version-ext = "dev"
2727
[package.metadata.template_ci.bench]
2828
run = true
2929
version = "stable"
30+
timeout = '20min'
3031

3132
[package.metadata.template_ci.additional_matrix_entries]
3233

0 commit comments

Comments
 (0)