build: use cmake-build for rdkafka (#10)

Signed-off-by: tison <[email protected]>

.github/workflows/ci.yml

@@ -34,8 +34,8 @@ concurrency:
 
 jobs:
   check:
-    name: Check
-    runs-on: ubuntu-latest
+    name: Check lint
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
@@ -45,18 +45,17 @@ jobs:
       - run: cargo x lint
 
   test:
-    name: Build and test
-    runs-on: ubuntu-latest
+    name: Run tests with testcontainers
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
       - uses: taiki-e/install-action@nextest
-      - run: cargo x build --locked
       - run: cargo x test
 
   required:
     name: Required
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: ${{ always() }}
     needs:
       - check

Cargo.toml

@@ -87,6 +87,7 @@ tokio-util = { version = "0.7", features = ["compat"] }
 toml = "0.8"
 url = "2.5"
 uuid = { version = "1.8", features = ["v4"] }
+which = { version = "6.0" }
 
 # workspace dependencies
 kafka-api = { version = "0.4.1", path = "api/kafka-api" }
@@ -115,6 +116,20 @@ shared-version = true
 sign-tag = true
 tag-name = "v{{version}}"
 
+[workspace.metadata.dist]
+cargo-dist-version = "0.22.1"
+ci = "github"
+install-path = "CARGO_HOME"
+install-updater = false
+installers = ["shell"]
+pr-run-mode = "upload"
+targets = [
+  "aarch64-apple-darwin",
+  "x86_64-apple-darwin",
+  "x86_64-unknown-linux-gnu",
+  "x86_64-pc-windows-msvc",
+]
+
 [profile.dist]
 inherits = "release"
 lto = "thin"

tests/rdkafka/Cargo.toml

@@ -23,12 +23,12 @@ readme.workspace = true
 repository.workspace = true
 version.workspace = true
 
-[dev-dependencies]
+[dependencies]
 log = { workspace = true }
 morax-protos = { workspace = true }
 morax-runtime = { workspace = true, features = ["test"] }
 morax-telemetry = { workspace = true }
-rdkafka = { version = "0.36" }
+rdkafka = { version = "0.36", features = ["cmake-build"] }
 test-harness = { workspace = true }
 tests-toolkit = { workspace = true }
 

tests/rdkafka/tests/pubsub.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod testkit;
-
 use std::time::Duration;
 
 use rdkafka::admin::NewTopic;
@@ -22,9 +20,9 @@ use rdkafka::consumer::Consumer;
 use rdkafka::producer::FutureRecord;
 use rdkafka::util::Timeout;
 use rdkafka::Message;
+use rdkafka_tests::harness;
+use rdkafka_tests::Testkit;
 use test_harness::test;
-use testkit::harness;
-use testkit::Testkit;
 
 #[test(harness)]
 async fn test_simple_pubsub(testkit: Testkit) {

tests/rskafka/Cargo.toml

@@ -23,7 +23,7 @@ readme.workspace = true
 repository.workspace = true
 version.workspace = true
 
-[dev-dependencies]
+[dependencies]
 log = { workspace = true }
 morax-protos = { workspace = true }
 morax-runtime = { workspace = true, features = ["test"] }

tests/rskafka/tests/pubsub.rs

@@ -12,18 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod testkit;
-
 use std::collections::BTreeMap;
 
 use rskafka::chrono::TimeZone;
 use rskafka::chrono::Utc;
 use rskafka::client::partition::Compression;
 use rskafka::client::partition::UnknownTopicHandling;
 use rskafka::record::Record;
+use rskafka_tests::harness;
+use rskafka_tests::Testkit;
 use test_harness::test;
-use testkit::harness;
-use testkit::Testkit;
 
 #[test(harness)]
 async fn test_simple_pubsub(testkit: Testkit) {

tests/wal/Cargo.toml

@@ -23,7 +23,7 @@ readme.workspace = true
 repository.workspace = true
 version.workspace = true
 
-[dev-dependencies]
+[dependencies]
 base64 = { workspace = true }
 insta = { workspace = true }
 log = { workspace = true }

tests/wal/tests/read_after_append.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod testkit;
-
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use insta::assert_compact_debug_snapshot;
@@ -22,8 +20,8 @@ use morax_protos::rpc::CreateLogRequest;
 use morax_protos::rpc::Entry;
 use morax_protos::rpc::ReadLogRequest;
 use test_harness::test;
-use testkit::harness;
-use testkit::Testkit;
+use wal_tests::harness;
+use wal_tests::Testkit;
 
 fn make_entry(payload: &str) -> Entry {
     Entry {

xtask/Cargo.toml

@@ -25,3 +25,4 @@ version.workspace = true
 
 [dependencies]
 clap = { workspace = true }
+which = { workspace = true }

xtask/src/main.rs

@@ -85,19 +85,15 @@ impl CommandLint {
 }
 
 fn find_command(cmd: &str) -> StdCommand {
-    let output = StdCommand::new("which")
-        .arg(cmd)
-        .output()
-        .expect("broken command: which");
-    if output.status.success() {
-        let result = String::from_utf8_lossy(&output.stdout);
-        let mut cmd = StdCommand::new(result.trim());
-        cmd.current_dir(env!("CARGO_WORKSPACE_DIR"));
-        cmd
-    } else {
-        let stdout = String::from_utf8_lossy(&output.stdout);
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        panic!("{cmd} not found.\nstdout: {}\nstderr: {}", stdout, stderr);
+    match which::which(cmd) {
+        Ok(exe) => {
+            let mut cmd = StdCommand::new(exe);
+            cmd.current_dir(env!("CARGO_WORKSPACE_DIR"));
+            cmd
+        }
+        Err(err) => {
+            panic!("{cmd} not found: {err}");
+        }
     }
 }