Skip to content

Commit e808345

Browse files
Lorak-mmkLorak-mmk
authored
Merge pull request #1259 from Lorak-mmk/minor-fixes
Minor CI / docs fixes
2 parents f591696 + d47f62f commit e808345

File tree

13 files changed

+63
-45
lines changed

13 files changed

+63
-45
lines changed

‎.github/workflows/authenticate_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: docker compose -f test/cluster/docker-compose-passauth.yml up -d
3030

3131
- name: Run tests
32-
run: SCYLLA_URI=172.43.0.2 RUST_LOG=trace cargo test --verbose authenticate_superuser -- custom_authentication --ignored
32+
run: SCYLLA_URI=172.43.0.2 RUST_LOG=trace cargo test authenticate_superuser -- custom_authentication --ignored
3333

3434
- name: Stop the cluster
3535
if: ${{ always() }}

‎.github/workflows/book.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install mdbook
3434
run: cargo install mdbook --no-default-features
3535
- name: Build the project
36-
run: cargo build --verbose --examples
36+
run: cargo build --examples
3737
- name: Build the book
3838
run: mdbook build docs
3939
- name: Run book tests

‎.github/workflows/cassandra.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ jobs:
2626
# A separate step for building to separate measuring time of compilation and testing
2727
- name: Update rust toolchain
2828
run: rustup update
29-
- name: Build the project
30-
run: cargo build --verbose --tests --features "full-serialization"
3129
- name: Run tests on cassandra
3230
run: |
33-
CDC='disabled' RUSTFLAGS="--cfg cassandra_tests" RUST_LOG=trace SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --verbose --features "full-serialization" -- --skip test_views_in_schema_info --skip test_large_batch_statements
31+
CDC='disabled' RUSTFLAGS="--cfg cassandra_tests" RUST_LOG=trace SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --features "full-serialization" -- --skip test_views_in_schema_info --skip test_large_batch_statements
3432
- name: Stop the cluster
3533
if: ${{ always() }}
3634
run: docker compose -f test/cluster/cassandra/docker-compose.yml stop

‎.github/workflows/docs-pages.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ on:
77
branches:
88
- main
99
tags:
10-
- 'v0.*.*'
11-
- 'v1.*.*'
10+
- 'v*.*.*'
1211
paths:
1312
- "docs/**"
1413
workflow_dispatch:

‎.github/workflows/rust.yml‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@ env:
1616
rust_min: 1.70.0 # <- Update this when bumping up MSRV
1717

1818
jobs:
19-
build:
19+
static_checks:
2020
runs-on: ubuntu-latest
2121
timeout-minutes: 60
2222
steps:
2323
- uses: actions/checkout@v3
24-
- name: Setup 3-node Scylla cluster
25-
run: |
26-
sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
27-
docker compose -f test/cluster/docker-compose.yml up -d --wait
2824
- name: Update rust toolchain
2925
run: rustup update
3026
- name: Print rustc version
@@ -34,13 +30,13 @@ jobs:
3430
- name: Print clippy version
3531
run: cargo clippy --version
3632
- name: Format check
37-
run: cargo fmt --verbose --all -- --check
33+
run: cargo fmt --all -- --check
3834
- name: Clippy check
39-
run: cargo clippy --verbose --all-targets
35+
run: cargo clippy --all-targets
4036
- name: Clippy check with all features
41-
run: cargo clippy --verbose --all-targets --all-features
37+
run: cargo clippy --all-targets --all-features
4238
- name: Cargo check with cpp_rust_unstable cfg
43-
run: RUSTFLAGS="--cfg cpp_rust_unstable" cargo clippy --verbose --all-targets --all-features
39+
run: RUSTFLAGS="--cfg cpp_rust_unstable" cargo clippy --all-targets --all-features
4440

4541
# Features checks.
4642
# No features.
@@ -75,13 +71,26 @@ jobs:
7571
# (openssl-x, rustls-x) is checked in tls.yml.
7672

7773
- name: Build scylla-cql
78-
run: cargo build --verbose --all-targets --manifest-path "scylla-cql/Cargo.toml" --features "full-serialization"
74+
run: cargo build --all-targets --manifest-path "scylla-cql/Cargo.toml" --features "full-serialization"
7975
- name: Build
80-
run: cargo build --verbose --all-targets --features "full-serialization"
76+
run: cargo build --all-targets --features "full-serialization"
77+
tests:
78+
runs-on: ubuntu-latest
79+
timeout-minutes: 60
80+
steps:
81+
- uses: actions/checkout@v3
82+
- name: Setup 3-node Scylla cluster
83+
run: |
84+
sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
85+
docker compose -f test/cluster/docker-compose.yml up -d --wait
86+
- name: Update rust toolchain
87+
run: rustup update
88+
- name: Print rustc version
89+
run: rustc --version
8190
- name: Run tests
8291
run: |
8392
cargo clean
84-
RUST_LOG=trace SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --verbose --features "full-serialization"
93+
RUST_LOG=trace SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --features "full-serialization"
8594
- name: Stop the cluster
8695
if: ${{ always() }}
8796
run: docker compose -f test/cluster/docker-compose.yml stop
@@ -105,11 +114,11 @@ jobs:
105114
- name: Use MSRV Cargo.lock
106115
run: mv Cargo.lock.msrv Cargo.lock
107116
- name: MSRV cargo check with features
108-
run: cargo check --verbose --all-targets --all-features --locked
117+
run: cargo check --all-targets --all-features --locked
109118
- name: MSRV cargo check without features
110-
run: cargo check --verbose --all-targets --locked --manifest-path "scylla/Cargo.toml"
119+
run: cargo check --all-targets --locked --manifest-path "scylla/Cargo.toml"
111120
- name: MSRV cargo check scylla-cql
112-
run: cargo check --verbose --all-targets --locked --manifest-path "scylla-cql/Cargo.toml"
121+
run: cargo check --all-targets --locked --manifest-path "scylla-cql/Cargo.toml"
113122

114123
# Tests that docstrings generate docs without warnings
115124
cargo_docs:

‎.github/workflows/semver_checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
issue-number: ${{ env.PR_ID }}
107107
comment-id: ${{ steps.find-comment.outputs.comment-id }}
108108
body: |
109-
`cargo semver-checks` found no API-breaking changes in this PR! 🎉🥳
109+
`cargo semver-checks` found no API-breaking changes in this PR.
110110
Checked commit: ${{ env.PR_HEAD }}
111111
edit-mode: replace
112112
if: needs.semver-pull-request-check.outputs.exitcode == '0'

‎.github/workflows/serverless.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Update rust toolchain
3232
run: rustup update
3333
- name: Check
34-
run: cargo check --verbose
34+
run: cargo check
3535
# Cloud-related feature sets.
3636
- name: Cargo check with unstable-cloud and openssl-x features
3737
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "unstable-cloud" --features "openssl-010"
@@ -45,7 +45,7 @@ jobs:
4545
- name: Run cloud-rustls example
4646
run: cargo run --example cloud-rustls -- $HOME/.ccm/serverless/config_data.yaml
4747
- name: Run cloud tests
48-
run: CLOUD_CONFIG_PATH=$HOME/.ccm/serverless/config_data.yaml RUSTFLAGS="--cfg scylla_cloud_tests" RUST_LOG=trace cargo test --verbose
48+
run: CLOUD_CONFIG_PATH=$HOME/.ccm/serverless/config_data.yaml RUSTFLAGS="--cfg scylla_cloud_tests" RUST_LOG=trace cargo test
4949

5050
- name: Remove serverless cluster
5151
run: ccm remove serverless

‎.github/workflows/tls.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: rustup update
2727

2828
- name: Check
29-
run: cargo check --verbose --features "openssl-010" --features "rustls-023"
29+
run: cargo check --features "openssl-010" --features "rustls-023"
3030
working-directory: ${{env.working-directory}}
3131

3232
- name: Start the cluster

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Currently, the list of people maintaining the driver include:
2626

2727
## Static checks
2828

29-
Currently, we require new PRs to compile without warnings, pass `cargo fmt` and `cargo clippy` checks.
29+
Currently, we require new PRs to compile without warnings, pass `cargo fmt` and a few variations of `cargo clippy` checks. You can run `make static` to execute most of those static checks.
3030

3131
## Testing
3232

‎MAINTENANCE.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Maintenance
22

33
The following document includes information how to release scylla-rust-driver and
4-
other information / procedures useful for maintainers.
4+
other information / procedures useful for maintainers. It is quite long, but it's
5+
mostly because it describes a lot of details and reasoning, not because it is
6+
complicated.
57

68
## Crates and versions
79

0 commit comments

Comments
 (0)