diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b609a48..7ccbaeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,10 @@ on: - main pull_request: { } +concurrency: + group: ${{ github.head_ref }} + cancel-in-progress: true + jobs: format: runs-on: ubuntu-latest @@ -13,7 +17,8 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: components: rustfmt - - run: cargo fmt --all --check + - name: rustfmt + run: cargo fmt --all --check lint: runs-on: ubuntu-latest @@ -22,14 +27,22 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: components: clippy - - run: cargo clippy --all-targets --all-features -- -D warnings + - name: clippy + run: | + sudo apt-get update + sudo apt-get install libglib2.0-dev libgtk-3-dev + cargo clippy --all-targets --all-features -- -D warnings cargo-test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@stable - - run: cargo test --all-features + - name: cargo test + run: | + sudo apt-get update + sudo apt-get install libglib2.0-dev libgtk-3-dev + cargo test --all-features deny: runs-on: ubuntu-latest @@ -39,4 +52,5 @@ jobs: - uses: taiki-e/install-action@v2 with: tool: cargo-deny - - run: cargo deny check + - name: cargo deny + run: cargo deny check diff --git a/assets/testing/ci.sh b/assets/testing/ci.sh index a3ca00e..58fc884 100755 --- a/assets/testing/ci.sh +++ b/assets/testing/ci.sh @@ -2,7 +2,7 @@ set -e cargo fmt --all --check cargo clippy --all-targets --all-features -- -D warnings -cargo test --all-features cargo r -p p2proxy-test-runner +cargo test --all-features cargo deny check gitleaks --verbose detect \ No newline at end of file diff --git a/p2proxy-test-runner/src/main.rs b/p2proxy-test-runner/src/main.rs index e732869..c2c9291 100644 --- a/p2proxy-test-runner/src/main.rs +++ b/p2proxy-test-runner/src/main.rs @@ -23,6 +23,7 @@ async fn main() -> anyhow::Result<()> { eprintln!("server at 4503:"); test_server_4503.dump_output().await; } - + simple_res?; + extensive_res?; Ok(()) }