Merge pull request #1274 from Lorak-mmk/ci-cache

Use cache in CI

Author: Lorak-mmk

.github/workflows/authenticate_test.yml

@@ -22,8 +22,8 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Update rust toolchain
-      run: rustup update
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
 
     - name: Start the cluster
       run: docker compose -f test/cluster/docker-compose-passauth.yml up -d

.github/workflows/book.yml

@@ -26,12 +26,15 @@ jobs:
         options: --health-cmd "cqlsh --debug scylladb" --health-interval 5s --health-retries 10
     steps:
     - uses: actions/checkout@v3
-    # Set to 1.81 because of regression in 1.82: https://github.com/rust-lang/rust/issues/131893
-    # TODO: change back to latest stable after this bug is fixed.
-    - name: Update rust toolchain
-      run: rustup default 1.81
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        # We can't use cache here, or mdbook will complain about multiple candidates for dependency.
+        cache: false
     - name: Install mdbook
-      run: cargo install mdbook --no-default-features
+      uses: taiki-e/install-action@v2
+      with:
+        tool: mdbook
     - name: Build the project
       run: cargo build --examples
     - name: Build the book

.github/workflows/cassandra.yml

@@ -24,8 +24,8 @@ jobs:
       run: |
         docker compose -f test/cluster/cassandra/docker-compose.yml up -d --wait
       # A separate step for building to separate measuring time of compilation and testing
-    - name: Update rust toolchain
-      run: rustup update
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
     - name: Run tests on cassandra
       run: |
         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

.github/workflows/rust.yml

@@ -21,61 +21,69 @@ jobs:
     timeout-minutes: 60
     steps:
     - uses: actions/checkout@v3
-    - name: Update rust toolchain
-      run: rustup update
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        components: clippy, rustfmt
     - name: Print rustc version
       run: rustc --version
     - name: Print rustfmt version
       run: cargo fmt --version
     - name: Print clippy version
       run: cargo clippy --version
+
+# Formatting
     - name: Format check
       run: cargo fmt --all -- --check
+
+# Basic clippy checks
     - name: Clippy check
       run: cargo clippy --all-targets
     - name: Clippy check with all features
       run: cargo clippy --all-targets --all-features
+
+# Verify scylla-cql separately
+    - name: Clippy scylla-cql
+      run: cargo clippy --all-targets -p scylla-cql --features "full-serialization"
+
+# cpp-rust-driver special cfg
     - name: Cargo check with cpp_rust_unstable cfg
-      run: RUSTFLAGS="--cfg cpp_rust_unstable" cargo clippy --all-targets --all-features
+      run: RUSTFLAGS="--cfg cpp_rust_unstable -Dwarnings" cargo clippy --all-targets --all-features
 
 # Features checks.
     # No features.
     - name: Cargo check without features
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features ""
+      run: cargo check --all-targets -p scylla --features ""
 
     # All features.
     - name: Cargo check with all features
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --all-features
+      run: cargo check --all-targets -p scylla --all-features
 
     # Various (de)serialization features.
     - name: Cargo check with all serialization features
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "full-serialization"
+      run: cargo check --all-targets -p scylla --features "full-serialization"
     - name: Cargo check with metrics feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "metrics"
+      run: cargo check --all-targets -p scylla --features "metrics"
     - name: Cargo check with secrecy-08 feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secrecy-08"
+      run: cargo check --all-targets -p scylla --features "secrecy-08"
     - name: Cargo check with chrono-04 feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "chrono-04"
+      run: cargo check --all-targets -p scylla --features "chrono-04"
     - name: Cargo check with time-03 feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "time-03"
+      run: cargo check --all-targets -p scylla --features "time-03"
     - name: Cargo check with num-bigint-03 feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "num-bigint-03"
+      run: cargo check --all-targets -p scylla --features "num-bigint-03"
     - name: Cargo check with num-bigint-04 feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "num-bigint-04"
+      run: cargo check --all-targets -p scylla --features "num-bigint-04"
     - name: Cargo check with bigdecimal-04 feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "bigdecimal-04"
+      run: cargo check --all-targets -p scylla --features "bigdecimal-04"
 
     # TLS-related feature sets.
     - name: Cargo check with openssl-x feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "openssl-010"
+      run: cargo check --all-targets -p scylla --features "openssl-010"
     - name: Cargo check with rustls-x feature
-      run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "rustls-023"
+      run: cargo check --all-targets -p scylla --features "rustls-023"
     # (openssl-x, rustls-x) is checked in tls.yml.
 
-    - name: Build scylla-cql
-      run: cargo build --all-targets --manifest-path "scylla-cql/Cargo.toml" --features "full-serialization"
-    - name: Build
-      run: cargo build --all-targets --features "full-serialization"
   tests:
     runs-on: ubuntu-latest
     timeout-minutes: 60
@@ -85,13 +93,12 @@ jobs:
       run: |
         sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
         docker compose -f test/cluster/docker-compose.yml up -d --wait
-    - name: Update rust toolchain
-      run: rustup update
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
     - name: Print rustc version
       run: rustc --version
     - name: Run tests
       run: |
-        cargo clean
         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"
     - name: Stop the cluster
       if: ${{ always() }}
@@ -108,26 +115,26 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install Rust ${{ env.rust_min }}
-      run: |
-        rustup install ${{ env.rust_min }}
-        rustup override set ${{ env.rust_min }}
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ env.rust_min }}
     - name: Print Rust version
       run: rustc --version
     - name: Use MSRV Cargo.lock
       run: mv Cargo.lock.msrv Cargo.lock
     - name: MSRV cargo check with features
       run: cargo check --all-targets --all-features --locked
     - name: MSRV cargo check without features
-      run: cargo check --all-targets --locked --manifest-path "scylla/Cargo.toml"
+      run: cargo check --all-targets --locked -p scylla
     - name: MSRV cargo check scylla-cql
-      run: cargo check --all-targets --locked --manifest-path "scylla-cql/Cargo.toml"
+      run: cargo check --all-targets --locked -p scylla-cql
 
   # Tests that docstrings generate docs without warnings
   cargo_docs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Update rust toolchain
-      run: rustup update
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
     - name: Compile docs
       run: RUSTDOCFLAGS=-Dwarnings cargo doc

.github/workflows/semver_checks.yml

@@ -55,12 +55,12 @@ jobs:
     # I don't know any way to do this using checkout action
     - name: Fetch PR base
       run: git fetch origin "$PR_BASE"
-    - name: Update rust toolchain
-      run: rustup update
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
     - name: Install semver-checks
-      # Official action uses binary releases fetched from GitHub
-      # If this pipeline becomes too slow, we should do this too.
-      run: cargo install cargo-semver-checks --no-default-features --features gix-reqwest
+      uses: taiki-e/install-action@v2
+      with:
+        tool: cargo-semver-checks
     - name: Verify the API compatibilty with PR base
       id: semver-pr-check
       run: |
@@ -143,9 +143,11 @@ jobs:
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v3
-    - name: Update rust toolchain
-      run: rustup update
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
     - name: Install semver-checks
-      run: cargo install cargo-semver-checks --no-default-features --features gix-reqwest
+      uses: taiki-e/install-action@v2
+      with:
+        tool: cargo-semver-checks
     - name: Run semver-checks to see if it agrees with version updates
       run: make semver-version

.github/workflows/serverless.yaml

@@ -26,17 +26,17 @@ jobs:
         run: |
           ccm create serverless -i 127.0.1. -n 1 --scylla -v release:6.2
           ccm start  --sni-proxy --sni-port 7777
-      - name: Update rust toolchain
-        run: rustup update
+      - name: Setup rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Check
         run: cargo check
       # Cloud-related feature sets.   
       - name: Cargo check with unstable-cloud and openssl-x features
-        run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "unstable-cloud" --features "openssl-010"
+        run: cargo check --all-targets -p scylla --features "unstable-cloud" --features "openssl-010"
       - name: Cargo check with unstable-cloud and rustls-x features
-        run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "unstable-cloud" --features "rustls-023"
+        run: cargo check --all-targets -p scylla --features "unstable-cloud" --features "rustls-023"
       - name: Cargo check with unstable-cloud, openssl-x and rustls-x features
-        run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "unstable-cloud" --features "openssl-010" --features "rustls-023"
+        run: cargo check --all-targets -p scylla --features "unstable-cloud" --features "openssl-010" --features "rustls-023"
 
       - name: Run cloud-openssl example
         run: cargo run --example cloud-openssl -- $HOME/.ccm/serverless/config_data.yaml

.github/workflows/tls.yml

@@ -22,8 +22,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Update rust toolchain
-      run: rustup update
+    - name: Setup rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
 
     - name: Check
       run: cargo check --features "openssl-010" --features "rustls-023"

Makefile

@@ -7,10 +7,10 @@ all: test
 static: fmt-check check check-without-features check-all-features clippy clippy-all-features
 
 .PHONY: ci
-ci: static test build
+ci: static test
 
 .PHONY: dockerized-ci
-dockerized-ci: static dockerized-test build
+dockerized-ci: static dockerized-test
 
 .PHONY: fmt
 fmt:
@@ -26,7 +26,7 @@ check:
 
 .PHONY: check-without-features
 check-without-features:
-	cargo check --manifest-path "scylla/Cargo.toml" --features "" --all-targets
+	cargo check -p scylla --features "" --all-targets
 
 .PHONY: check-all-features
 check-all-features: