Skip to content

Commit

Permalink
Merge pull request #853 from piodul/fix-benchest-and-test-all-targets…
Browse files Browse the repository at this point in the history
…-in-ci

benchmarks/CI: make benchmarks compile and build them in CI
  • Loading branch information
Lorak-mmk authored Oct 26, 2023
2 parents 535c724 + 9965289 commit 5830269
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:
- name: Format check
run: cargo fmt --verbose --all -- --check
- name: Clippy check
run: cargo clippy --verbose --examples --tests -- -Aclippy::uninlined_format_args
run: cargo clippy --verbose --all-targets -- -Aclippy::uninlined_format_args
- name: Cargo check without features
run: cargo check --manifest-path "scylla/Cargo.toml" --features ""
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features ""
- name: Cargo check with secrecy feature
run: cargo check --manifest-path "scylla/Cargo.toml" --features "secret"
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secret"
- name: Build scylla-cql
run: cargo build --verbose --all-targets --manifest-path "scylla-cql/Cargo.toml"
- name: Build
run: cargo build --verbose --examples
run: cargo build --verbose --all-targets
- name: Run tests
run: SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --verbose
- name: Stop the cluster
Expand All @@ -61,9 +61,9 @@ jobs:
- name: Print Rust version
run: rustc --version
- name: MSRV cargo check with features
run: cargo check --verbose --examples --tests
run: cargo check --verbose --all-targets
- name: MSRV cargo check without features
run: cargo check --verbose --manifest-path "scylla/Cargo.toml"
run: cargo check --verbose --all-targets --manifest-path "scylla/Cargo.toml"
- name: MSRV cargo check scylla-cql
run: cargo check --verbose --all-targets --manifest-path "scylla-cql/Cargo.toml"

Expand Down
2 changes: 1 addition & 1 deletion scylla/benches/benchmark.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn types_benchmark(c: &mut Criterion) {
c.bench_function("short", |b| {
b.iter(|| {
buf.clear();
types::write_short(-1, &mut buf);
types::write_short(u16::MAX, &mut buf);
types::read_short(&mut &buf[..]).unwrap();
})
});
Expand Down

0 comments on commit 5830269

Please sign in to comment.