From 0eddab0b2e0a9ec7d135a7fd8c42fca8cf8668dc Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 11 Apr 2024 10:20:26 +0700 Subject: [PATCH] Use aptitude over apt for resolving conflicts --- .github/workflows/style_checks.yml | 59 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/style_checks.yml b/.github/workflows/style_checks.yml index d1b8bf55..bfbbe3e3 100644 --- a/.github/workflows/style_checks.yml +++ b/.github/workflows/style_checks.yml @@ -7,48 +7,49 @@ jobs: name: Clippy runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: apt install gstreamer - run: | - sudo apt update - sudo apt install -y libgstrtspserver-1.0-dev libgstreamer1.0-dev libgtk2.0-dev - - uses: actions-rs/toolchain@v1 - with: + - uses: actions/checkout@v1 + - name: apt install gstreamer + run: | + sudo apt-get update + sudo apt-get install -y aptitude + sudo aptitude install -y libgstrtspserver-1.0-dev libgstreamer1.0-dev libgtk2.0-dev + - uses: actions-rs/toolchain@v1 + with: toolchain: nightly components: clippy override: true - - name: Run clippy action to produce annotations - uses: actions-rs/clippy-check@v1 - if: steps.check_permissions.outputs.has-permission - with: - toolchain: nightly - token: ${{ secrets.GITHUB_TOKEN }} - args: --workspace --all-targets --all-features - - name: Run clippy manually without annotations - if: ${{ !steps.check_permissions.outputs.has-permission }} - run: cargo +nightly clippy --workspace --all-targets --all-features + - name: Run clippy action to produce annotations + uses: actions-rs/clippy-check@v1 + if: steps.check_permissions.outputs.has-permission + with: + toolchain: nightly + token: ${{ secrets.GITHUB_TOKEN }} + args: --workspace --all-targets --all-features + - name: Run clippy manually without annotations + if: ${{ !steps.check_permissions.outputs.has-permission }} + run: cargo +nightly clippy --workspace --all-targets --all-features check_fmt: name: Rust-fmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: + - uses: actions/checkout@v1 + - uses: actions-rs/toolchain@v1 + with: toolchain: nightly components: rustfmt override: true - - name: rustfmt - run: | - cargo +nightly fmt --all -- --check + - name: rustfmt + run: | + cargo +nightly fmt --all -- --check check_lua: name: Luacheck runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Run luacheck - uses: nebularg/actions-luacheck@v1 - with: - files: 'dissector/baichuan.lua' - args: --globals Dissector Proto ProtoField base ByteArray DESEGMENT_ONE_MORE_SEGMENT DissectorTable + - uses: actions/checkout@v1 + - name: Run luacheck + uses: nebularg/actions-luacheck@v1 + with: + files: "dissector/baichuan.lua" + args: --globals Dissector Proto ProtoField base ByteArray DESEGMENT_ONE_MORE_SEGMENT DissectorTable