Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed from actions-rs to more maintained alternatives #13

Merged
merged 2 commits into from
Aug 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .github/workflows/build-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,11 @@ jobs:
with:
submodules: recursive
- name: Setup rust
uses: actions-rs/toolchain@v1
uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
with:
toolchain: stable
components: rustfmt, clippy
- name: Cargo check
uses: actions-rs/cargo@v1
with:
command: check
- run: cargo check
test:
runs-on: ubuntu-latest
steps:
Expand All @@ -37,10 +34,8 @@ jobs:
with:
submodules: recursive
- name: Setup rust
uses: actions-rs/toolchain@v1
uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
with:
toolchain: stable
- name: Cargo test
uses: actions-rs/cargo@v1
with:
command: test
run: cargo test
4 changes: 2 additions & 2 deletions .github/workflows/publish-libosdp-sys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
with:
toolchain: stable
override: true
Expand All @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
with:
toolchain: stable
override: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-libosdp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
with:
toolchain: stable
override: true
Expand All @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
with:
toolchain: stable
override: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-osdpctl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
with:
toolchain: stable
override: true
Expand Down
1 change: 1 addition & 0 deletions libosdp/tests/common/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type Result<T> = core::result::Result<T, libosdp::OsdpError>;

pub struct CpDevice {
dev: Arc<Mutex<ControlPanel>>,
#[allow(unused)] // false positive, it is used!
pub receiver: Receiver<(i32, OsdpEvent)>,
}

Expand Down
2 changes: 2 additions & 0 deletions libosdp/tests/common/threadbus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub struct ThreadBus {
recv: Mutex<BroadcastReceiver<Vec<u8>>>,
}

#[allow(unused)] // false positive, it is used!
fn str_to_channel_id(key: &str) -> i32 {
let mut hasher = DefaultHasher::new();
key.hash(&mut hasher);
Expand All @@ -29,6 +30,7 @@ fn str_to_channel_id(key: &str) -> i32 {
}

impl ThreadBus {
#[allow(unused)] // false positive, it is used!
pub fn new(name: &str) -> Self {
let (send, recv) = multiqueue::broadcast_queue(4);
Self {
Expand Down