diff options
| author | MatthieuCoder <matthieu@matthieu-dev.xyz> | 2023-01-03 15:19:10 +0400 |
|---|---|---|
| committer | MatthieuCoder <matthieu@matthieu-dev.xyz> | 2023-01-03 15:19:10 +0400 |
| commit | cf52cb6a7e4053b3f83438e86f300cbfd06d4a46 (patch) | |
| tree | 8abe213d9f9e9e35c9d79609d84a1ce461c559d7 | |
| parent | c4f51ba3d0474492861044b0765d9580cbbff75b (diff) | |
fix builds
| -rw-r--r-- | .github/workflows/build.yml | 25 | ||||
| -rw-r--r-- | libs/leash/src/lib.rs | 21 |
2 files changed, 28 insertions, 18 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c1c3b2..30b118f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,8 +50,6 @@ jobs: - macOS-latest rust: - stable - - beta - - nightly runs-on: ${{ matrix.os }} needs: [compile] steps: @@ -64,6 +62,25 @@ jobs: - name: Setup | Rust uses: ATiltedTree/setup-rust@v1 with: - rust-version: ${{ matrix.rust }} + rust-version: stable + - uses: actions/setup-go@v3 + with: + go-version: '1.16.1' # The Go version to download (if necessary) and use. - name: Build | Compile - run: cargo test + run: cargo build --release + - name: Build | All in one + run: + - cd exes/all + - make build + shell: bash + - name: Finish | Prepare artifacts + run: + - mkdir -p artifacts + - cp target/release/{cache,gateway,webhook,ratelimit} ./artifacts + - cp exes/all/build/all ./artifacts + shell: bash + - name: Finish | Archive build results + uses: actions/upload-artifact@v3 + with: + name: artifacts + path: artifacts/*
\ No newline at end of file diff --git a/libs/leash/src/lib.rs b/libs/leash/src/lib.rs index 3dafdac..13e8258 100644 --- a/libs/leash/src/lib.rs +++ b/libs/leash/src/lib.rs @@ -2,7 +2,6 @@ use anyhow::Result; use serde::de::DeserializeOwned; use shared::{ config::Settings, - log::{error, info}, }; use std::{future::Future, pin::Pin}; use tokio::{signal::unix::SignalKind, sync::oneshot}; @@ -32,21 +31,15 @@ pub trait Component: Send + Sync + 'static + Sized { tokio::spawn(async move {}); tokio::spawn(async move { - match tokio::signal::unix::signal(SignalKind::terminate()) + #[cfg(unix)] + tokio::signal::unix::signal(SignalKind::terminate()) .unwrap() .recv() - .await - { - Some(()) => { - info!("Stopping program."); - - stop.send(()).unwrap(); - } - None => { - error!("Unable to listen for shutdown signal"); - // we also shut down in case of error - } - } + .await; + #[cfg(not(unix))] + tokio::signal::ctrl_c().await; + + stop.send(()).unwrap(); }); self.start(settings?, stop_channel).await }) |