From faf7fd33e40d8da86d4dd0b58ede7ccc4fba2d29 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Mon, 7 Oct 2019 19:20:14 -0400 Subject: [PATCH 1/4] Move to workspace builds --- Cargo.toml | 27 ++++--------------- aeron-rs/Cargo.toml | 22 +++++++++++++++ {examples => aeron-rs/examples}/aeronmd.rs | 0 .../examples}/aeronmd_sys.rs | 0 .../src}/client/cnc_descriptor.rs | 0 .../src}/client/concurrent/atomic_buffer.rs | 0 .../src}/client/concurrent/mod.rs | 0 .../src}/client/concurrent/ring_buffer.rs | 0 {src => aeron-rs/src}/client/context.rs | 0 {src => aeron-rs/src}/client/driver_proxy.rs | 0 {src => aeron-rs/src}/client/mod.rs | 0 {src => aeron-rs/src}/control_protocol.rs | 0 {src => aeron-rs/src}/driver.rs | 0 {src => aeron-rs/src}/lib.rs | 0 {src => aeron-rs/src}/util.rs | 0 {tests => aeron-rs/tests}/cnc_terminate.rs | 0 16 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 aeron-rs/Cargo.toml rename {examples => aeron-rs/examples}/aeronmd.rs (100%) rename {examples => aeron-rs/examples}/aeronmd_sys.rs (100%) rename {src => aeron-rs/src}/client/cnc_descriptor.rs (100%) rename {src => aeron-rs/src}/client/concurrent/atomic_buffer.rs (100%) rename {src => aeron-rs/src}/client/concurrent/mod.rs (100%) rename {src => aeron-rs/src}/client/concurrent/ring_buffer.rs (100%) rename {src => aeron-rs/src}/client/context.rs (100%) rename {src => aeron-rs/src}/client/driver_proxy.rs (100%) rename {src => aeron-rs/src}/client/mod.rs (100%) rename {src => aeron-rs/src}/control_protocol.rs (100%) rename {src => aeron-rs/src}/driver.rs (100%) rename {src => aeron-rs/src}/lib.rs (100%) rename {src => aeron-rs/src}/util.rs (100%) rename {tests => aeron-rs/tests}/cnc_terminate.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index b999168..31811c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,22 +1,5 @@ -[package] -name = "aeron-rs" -version = "0.1.0" -authors = ["Bradlee Speice "] -edition = "2018" -repository = "https://github.com/bspeice/aeron-rs" -readme = "README.md" -license = "Apache-2.0" - -[badges] -travis-ci = { repository = "bspeice/aeron-rs", branch = "master" } -maintenance = { status = "actively-developed" } - -[dependencies] -aeron_driver-sys = { path = "./aeron_driver-sys" } -memmap = "0.7" -num = "0.2" - -[dev-dependencies] -clap = "2.33" -ctrlc = "3.1.3" -tempfile = "3.1" +[workspace] +members = [ + "aeron_driver-sys", + "aeron-rs" +] diff --git a/aeron-rs/Cargo.toml b/aeron-rs/Cargo.toml new file mode 100644 index 0000000..c08e48b --- /dev/null +++ b/aeron-rs/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "aeron-rs" +version = "0.1.0" +authors = ["Bradlee Speice "] +edition = "2018" +repository = "https://github.com/bspeice/aeron-rs" +readme = "README.md" +license = "Apache-2.0" + +[badges] +travis-ci = { repository = "bspeice/aeron-rs", branch = "master" } +maintenance = { status = "actively-developed" } + +[dependencies] +aeron_driver-sys = { path = "../aeron_driver-sys" } +memmap = "0.7" +num = "0.2" + +[dev-dependencies] +clap = "2.33" +ctrlc = "3.1.3" +tempfile = "3.1" diff --git a/examples/aeronmd.rs b/aeron-rs/examples/aeronmd.rs similarity index 100% rename from examples/aeronmd.rs rename to aeron-rs/examples/aeronmd.rs diff --git a/examples/aeronmd_sys.rs b/aeron-rs/examples/aeronmd_sys.rs similarity index 100% rename from examples/aeronmd_sys.rs rename to aeron-rs/examples/aeronmd_sys.rs diff --git a/src/client/cnc_descriptor.rs b/aeron-rs/src/client/cnc_descriptor.rs similarity index 100% rename from src/client/cnc_descriptor.rs rename to aeron-rs/src/client/cnc_descriptor.rs diff --git a/src/client/concurrent/atomic_buffer.rs b/aeron-rs/src/client/concurrent/atomic_buffer.rs similarity index 100% rename from src/client/concurrent/atomic_buffer.rs rename to aeron-rs/src/client/concurrent/atomic_buffer.rs diff --git a/src/client/concurrent/mod.rs b/aeron-rs/src/client/concurrent/mod.rs similarity index 100% rename from src/client/concurrent/mod.rs rename to aeron-rs/src/client/concurrent/mod.rs diff --git a/src/client/concurrent/ring_buffer.rs b/aeron-rs/src/client/concurrent/ring_buffer.rs similarity index 100% rename from src/client/concurrent/ring_buffer.rs rename to aeron-rs/src/client/concurrent/ring_buffer.rs diff --git a/src/client/context.rs b/aeron-rs/src/client/context.rs similarity index 100% rename from src/client/context.rs rename to aeron-rs/src/client/context.rs diff --git a/src/client/driver_proxy.rs b/aeron-rs/src/client/driver_proxy.rs similarity index 100% rename from src/client/driver_proxy.rs rename to aeron-rs/src/client/driver_proxy.rs diff --git a/src/client/mod.rs b/aeron-rs/src/client/mod.rs similarity index 100% rename from src/client/mod.rs rename to aeron-rs/src/client/mod.rs diff --git a/src/control_protocol.rs b/aeron-rs/src/control_protocol.rs similarity index 100% rename from src/control_protocol.rs rename to aeron-rs/src/control_protocol.rs diff --git a/src/driver.rs b/aeron-rs/src/driver.rs similarity index 100% rename from src/driver.rs rename to aeron-rs/src/driver.rs diff --git a/src/lib.rs b/aeron-rs/src/lib.rs similarity index 100% rename from src/lib.rs rename to aeron-rs/src/lib.rs diff --git a/src/util.rs b/aeron-rs/src/util.rs similarity index 100% rename from src/util.rs rename to aeron-rs/src/util.rs diff --git a/tests/cnc_terminate.rs b/aeron-rs/tests/cnc_terminate.rs similarity index 100% rename from tests/cnc_terminate.rs rename to aeron-rs/tests/cnc_terminate.rs From 9f086c59650aea5968548dcb8aedac79b6298d51 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Mon, 7 Oct 2019 19:26:33 -0400 Subject: [PATCH 2/4] Fix the Travis build --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4384fb8..e57e51b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,10 @@ script: - cargo test --release - cargo test --features "static" - - cd .. + - cd ../aeron-rs - cargo test - cargo test --release + + - cd .. - cargo clippy --all - cargo fmt --all -- --check From 419cbf158c1c4388c50e279f57c3cee96db6e677 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Mon, 7 Oct 2019 22:17:14 -0400 Subject: [PATCH 3/4] Refactor workspace build --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e57e51b..2a8b24c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,13 @@ before_script: - rustup component add rustfmt script: - - cd aeron_driver-sys + - cargo test --no-run - cargo test + - cargo test --release --no-run - cargo test --release - - cargo test --features "static" - - cd ../aeron-rs - - cargo test - - cargo test --release + - cd aeron_driver-sys/ + - cargo test --features "static" - cd .. - cargo clippy --all From 46baa54f759de738926f4e155ebb48256cc19291 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Mon, 7 Oct 2019 22:57:27 -0400 Subject: [PATCH 4/4] Add bors.toml --- .travis.yml | 7 +++++++ bors.toml | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 bors.toml diff --git a/.travis.yml b/.travis.yml index 2a8b24c..2fecfe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,3 +26,10 @@ script: - cd .. - cargo clippy --all - cargo fmt --all -- --check + +branches: + only: + - master + - staging + - trying + diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000..574c563 --- /dev/null +++ b/bors.toml @@ -0,0 +1,4 @@ +status = [ + "continuous-integration/travis-ci/push", +] +delete_merged_branches = true