diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19e9477..1dc6e57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,9 +28,6 @@ jobs: - name: Checkout opendata-java uses: actions/checkout@v4 - - name: Checkout opendata - run: git clone --depth 1 https://github.com/opendata-oss/opendata.git ../opendata - - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable diff --git a/README.md b/README.md index f0bcdad..9198da6 100644 --- a/README.md +++ b/README.md @@ -15,14 +15,12 @@ Prerequisites: - Rust toolchain - Java 17+ - Maven 3.8+ -- Local clone of [opendata](https://github.com/opendata-oss/opendata) as sibling directory - ```bash -# Build native library +# Build native library (fetches opendata dependency via git automatically) cd log/native cargo build --release -# Build Java modules +# Build and test Java modules cd ../.. -mvn clean install +mvn verify -Djava.library.path=log/native/target/release ``` diff --git a/log/native/Cargo.lock b/log/native/Cargo.lock index 2e0652b..e2e3083 100644 --- a/log/native/Cargo.lock +++ b/log/native/Cargo.lock @@ -275,6 +275,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" +source = "git+https://github.com/opendata-oss/opendata.git#74d36908ffa729652ba665cd335f01b661bcfc0c" dependencies = [ "async-trait", "bytes", @@ -1318,6 +1319,7 @@ dependencies = [ [[package]] name = "log" version = "0.1.0" +source = "git+https://github.com/opendata-oss/opendata.git#74d36908ffa729652ba665cd335f01b661bcfc0c" dependencies = [ "async-trait", "bytes", diff --git a/log/native/Cargo.toml b/log/native/Cargo.toml index 46e281b..fdf7685 100644 --- a/log/native/Cargo.toml +++ b/log/native/Cargo.toml @@ -11,12 +11,5 @@ jni = "0.21" bytes = "1" tokio = { version = "1", features = ["rt-multi-thread", "sync", "time"] } -# Local path to opendata crates (sibling directory) -# Assumes: ../opendata/ and ../opendata-java/ are siblings -[dependencies.log] -package = "log" -path = "../../../opendata/log" - -[dependencies.common] -package = "common" -path = "../../../opendata/common" +log = { git = "https://github.com/opendata-oss/opendata.git" } +common = { git = "https://github.com/opendata-oss/opendata.git" }