1
0
forked from ROMEO/nexosim

Merge pull request #2 from asynchronics/feature/improved-ci

Feature/improved ci
This commit is contained in:
Serge Barral 2024-04-26 13:55:20 +02:00 committed by GitHub
commit 4de071eaf3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 9 deletions

View File

@ -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

View File

@ -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.

View File

@ -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;