From 8ed8bc9015857ad3aa563e82b5b521845db78366 Mon Sep 17 00:00:00 2001 From: Mikhail Cheshkov Date: Fri, 6 Sep 2024 17:45:10 +0300 Subject: [PATCH 1/3] chore(cubesql): Align Rust toolchain in cubenativeutils and cubesqlplanner with CI --- rust/cubenativeutils/rust-toolchain.toml | 4 ++-- rust/cubesqlplanner/rust-toolchain.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/cubenativeutils/rust-toolchain.toml b/rust/cubenativeutils/rust-toolchain.toml index 5e592ccdac8d5..ef8073e17f1d2 100644 --- a/rust/cubenativeutils/rust-toolchain.toml +++ b/rust/cubenativeutils/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2023-12-13" +channel = "nightly-2024-07-15" components = ["rustfmt", "rustc-dev", "clippy"] -profile = "minimal" \ No newline at end of file +profile = "minimal" diff --git a/rust/cubesqlplanner/rust-toolchain.toml b/rust/cubesqlplanner/rust-toolchain.toml index 5e592ccdac8d5..ef8073e17f1d2 100644 --- a/rust/cubesqlplanner/rust-toolchain.toml +++ b/rust/cubesqlplanner/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2023-12-13" +channel = "nightly-2024-07-15" components = ["rustfmt", "rustc-dev", "clippy"] -profile = "minimal" \ No newline at end of file +profile = "minimal" From 268658e59e067a63b1e7e420ab4e860918c9a996 Mon Sep 17 00:00:00 2001 From: Mikhail Cheshkov Date: Fri, 6 Sep 2024 17:45:31 +0300 Subject: [PATCH 2/3] chore(cubesql): Update Cargo.lock in cubenativeutils and cubesqlplanner --- rust/cubenativeutils/Cargo.lock | 1 - rust/cubesqlplanner/Cargo.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/rust/cubenativeutils/Cargo.lock b/rust/cubenativeutils/Cargo.lock index 8a7ca561e9dbd..9f25443a9e483 100644 --- a/rust/cubenativeutils/Cargo.lock +++ b/rust/cubenativeutils/Cargo.lock @@ -718,7 +718,6 @@ dependencies = [ "regex", "rust_decimal", "serde", - "serde_derive", "serde_json", "sha1_smol", "sha2", diff --git a/rust/cubesqlplanner/Cargo.lock b/rust/cubesqlplanner/Cargo.lock index c5e3de6e44247..d8a3d4a1d844e 100644 --- a/rust/cubesqlplanner/Cargo.lock +++ b/rust/cubesqlplanner/Cargo.lock @@ -726,7 +726,6 @@ dependencies = [ "regex", "rust_decimal", "serde", - "serde_derive", "serde_json", "sha1_smol", "sha2", From 84330877d75bf6c16d1dd9b44ee3ebbb1765e786 Mon Sep 17 00:00:00 2001 From: Mikhail Cheshkov Date: Fri, 6 Sep 2024 17:46:02 +0300 Subject: [PATCH 3/3] ci(cubesql): Attach cubenativeutils and cubesqlplanner to cargo fmt and cargo check --- .github/workflows/rust-cubesql.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/rust-cubesql.yml b/.github/workflows/rust-cubesql.yml index c4d57686e5b37..903ba6a8fc934 100644 --- a/.github/workflows/rust-cubesql.yml +++ b/.github/workflows/rust-cubesql.yml @@ -41,11 +41,21 @@ jobs: shared-key: cubesql-${{ runner.OS }}-x86_64-unknown-linux-gnu - name: Lint CubeSQL run: cd rust/cubesql && cargo fmt --all -- --check + - name: Lint Native utils + run: cd rust/cubenativeutils && cargo fmt --all -- --check + - name: Lint SQL planner + run: cd rust/cubesqlplanner && cargo fmt --all -- --check - name: Lint Native run: cd packages/cubejs-backend-native && cargo fmt --all -- --check # TODO replace with clippy once cubesql is ready - name: Check CubeSQL run: cd rust/cubesql && cargo check --locked --workspace --all-targets --keep-going + # TODO replace with clippy once cubenativeutils is ready + - name: Check Native utils + run: cd rust/cubenativeutils && cargo check --locked --workspace --all-targets --keep-going + # TODO replace with clippy once cubesqlplanner is ready + - name: Check SQL planner + run: cd rust/cubesqlplanner && cargo check --locked --workspace --all-targets --keep-going - name: Clippy Native run: cd packages/cubejs-backend-native && cargo clippy --locked --workspace --all-targets --keep-going -- -D warnings - name: Clippy Native (with Python)