diff --git a/.cargo/config b/.cargo/config.toml similarity index 72% rename from .cargo/config rename to .cargo/config.toml index 7cb1e4e..5adae5e 100644 --- a/.cargo/config +++ b/.cargo/config.toml @@ -2,4 +2,4 @@ rustflags = "-Ctarget-feature=-crt-static" [target.aarch64-unknown-linux-musl] -rustflags = "-Ctarget-feature=-crt-static" \ No newline at end of file +rustflags = "-Ctarget-feature=-crt-static" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae263e0..89168a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,3 +60,17 @@ jobs: - name: Run tests run: cargo test --verbose + + # NOTE: In GitHub repository settings, the "Require status checks to pass + # before merging" branch protection rule ensures that commits are only merged + # from branches where specific status checks have passed. These checks are + # specified manually as a list of workflow job names. Thus we use this extra + # job to signal whether all CI checks have passed. + ci: + name: CI status checks + runs-on: ubuntu-latest + needs: build + if: always() + steps: + - name: Check whether all jobs pass + run: echo '${{ toJson(needs) }}' | jq -e 'all(.result == "success")' diff --git a/Cargo.toml b/Cargo.toml index ab977d3..929cff9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,14 +45,14 @@ log = "0.4.17" rocksdb = "0.20.1" serde_json = "1.0.94" uhlc = "0.5.2" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", features = ["unstable"] } -zenoh-codec = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } -zenoh-collections = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } -zenoh-core = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } -zenoh-protocol = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } -zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } -zenoh-keyexpr = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } -zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } +zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", features = ["unstable"] } +zenoh-codec = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } +zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } +zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } +zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } +zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } +zenoh-keyexpr = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } +zenoh_backend_traits = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } [build-dependencies] rustc_version = "0.4.0" @@ -63,4 +63,4 @@ maintainer = "zenoh-dev@eclipse.org" copyright = "2022 ZettaScale Technology" section = "net" license-file = ["LICENSE", "0"] -depends = "zenoh-plugin-storage-manager (=0.11.0-dev)" +depends = "zenoh-plugin-storage-manager (=0.11.0-dev-1)"