From 9956c4fa3fd97b58df8311307de6a9dee6e61069 Mon Sep 17 00:00:00 2001 From: Serge Barral Date: Fri, 26 Apr 2024 13:26:49 +0200 Subject: [PATCH] CI: add --all-features and force check on `dev` --- .github/workflows/ci.yml | 14 +++++++------- asynchronix/src/rpc/endpoint_registry.rs | 2 +- asynchronix/src/rpc/key_registry.rs | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efb6ebc..8c952a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: pull_request: push: - branches: [ main ] + branches: [ main, dev ] env: RUSTFLAGS: -Dwarnings @@ -28,7 +28,7 @@ jobs: toolchain: ${{ matrix.rust }} - name: Run cargo check - run: cargo check + run: cargo check --features="rpc grpc-server" test: name: Test suite @@ -41,7 +41,7 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Run cargo test - run: cargo test + run: cargo test --features="rpc grpc-server" loom-dry-run: name: Loom dry run @@ -54,7 +54,7 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Dry-run cargo test (Loom) - run: cargo test --no-run --tests + run: cargo test --no-run --tests --features="rpc grpc-server" env: RUSTFLAGS: --cfg asynchronix_loom @@ -71,7 +71,7 @@ jobs: components: miri - name: Run cargo miri tests - run: cargo miri test --tests --lib + run: cargo miri test --tests --lib --features="rpc grpc-server" env: MIRIFLAGS: -Zmiri-strict-provenance -Zmiri-disable-isolation -Zmiri-num-cpus=4 @@ -104,7 +104,7 @@ jobs: run: cargo fmt --all -- --check - name: Run cargo clippy - run: cargo clippy + run: cargo clippy --features="rpc grpc-server" docs: name: Docs @@ -117,4 +117,4 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Run cargo doc - run: cargo doc --no-deps --document-private-items + run: cargo doc --no-deps --features="rpc grpc-server" --document-private-items diff --git a/asynchronix/src/rpc/endpoint_registry.rs b/asynchronix/src/rpc/endpoint_registry.rs index 8a71ffb..9ded8e5 100644 --- a/asynchronix/src/rpc/endpoint_registry.rs +++ b/asynchronix/src/rpc/endpoint_registry.rs @@ -9,7 +9,7 @@ use serde::de::DeserializeOwned; use serde::Serialize; use crate::ports::{EventSinkStream, EventSource, QuerySource, ReplyReceiver}; -use crate::time::{Action, ActionKey}; +use crate::simulation::{Action, ActionKey}; /// A registry that holds all sources and sinks meant to be accessed through /// remote procedure calls. diff --git a/asynchronix/src/rpc/key_registry.rs b/asynchronix/src/rpc/key_registry.rs index fa76e47..0c6678e 100644 --- a/asynchronix/src/rpc/key_registry.rs +++ b/asynchronix/src/rpc/key_registry.rs @@ -1,4 +1,5 @@ -use crate::time::{ActionKey, MonotonicTime}; +use crate::simulation::ActionKey; +use crate::time::MonotonicTime; use crate::util::indexed_priority_queue::{IndexedPriorityQueue, InsertKey}; pub(crate) type KeyRegistryId = InsertKey;