Skip to content
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
22 changes: 18 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
- main
pull_request: { }

concurrency:
group: ${{ github.head_ref }}
cancel-in-progress: true

jobs:
format:
runs-on: ubuntu-latest
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion assets/testing/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion p2proxy-test-runner/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ async fn main() -> anyhow::Result<()> {
eprintln!("server at 4503:");
test_server_4503.dump_output().await;
}

simple_res?;
extensive_res?;
Ok(())
}