Skip to content

Commit 0eddab0

Browse files
Use aptitude over apt for resolving conflicts
1 parent e7268f2 commit 0eddab0

File tree

1 file changed

+30
-29
lines changed

1 file changed

+30
-29
lines changed

.github/workflows/style_checks.yml

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,49 @@ jobs:
77
name: Clippy
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v1
11-
- name: apt install gstreamer
12-
run: |
13-
sudo apt update
14-
sudo apt install -y libgstrtspserver-1.0-dev libgstreamer1.0-dev libgtk2.0-dev
15-
- uses: actions-rs/toolchain@v1
16-
with:
10+
- uses: actions/checkout@v1
11+
- name: apt install gstreamer
12+
run: |
13+
sudo apt-get update
14+
sudo apt-get install -y aptitude
15+
sudo aptitude install -y libgstrtspserver-1.0-dev libgstreamer1.0-dev libgtk2.0-dev
16+
- uses: actions-rs/toolchain@v1
17+
with:
1718
toolchain: nightly
1819
components: clippy
1920
override: true
20-
- name: Run clippy action to produce annotations
21-
uses: actions-rs/clippy-check@v1
22-
if: steps.check_permissions.outputs.has-permission
23-
with:
24-
toolchain: nightly
25-
token: ${{ secrets.GITHUB_TOKEN }}
26-
args: --workspace --all-targets --all-features
27-
- name: Run clippy manually without annotations
28-
if: ${{ !steps.check_permissions.outputs.has-permission }}
29-
run: cargo +nightly clippy --workspace --all-targets --all-features
21+
- name: Run clippy action to produce annotations
22+
uses: actions-rs/clippy-check@v1
23+
if: steps.check_permissions.outputs.has-permission
24+
with:
25+
toolchain: nightly
26+
token: ${{ secrets.GITHUB_TOKEN }}
27+
args: --workspace --all-targets --all-features
28+
- name: Run clippy manually without annotations
29+
if: ${{ !steps.check_permissions.outputs.has-permission }}
30+
run: cargo +nightly clippy --workspace --all-targets --all-features
3031

3132
check_fmt:
3233
name: Rust-fmt
3334
runs-on: ubuntu-latest
3435
steps:
35-
- uses: actions/checkout@v1
36-
- uses: actions-rs/toolchain@v1
37-
with:
36+
- uses: actions/checkout@v1
37+
- uses: actions-rs/toolchain@v1
38+
with:
3839
toolchain: nightly
3940
components: rustfmt
4041
override: true
41-
- name: rustfmt
42-
run: |
43-
cargo +nightly fmt --all -- --check
42+
- name: rustfmt
43+
run: |
44+
cargo +nightly fmt --all -- --check
4445
4546
check_lua:
4647
name: Luacheck
4748
runs-on: ubuntu-latest
4849
steps:
49-
- uses: actions/checkout@v1
50-
- name: Run luacheck
51-
uses: nebularg/actions-luacheck@v1
52-
with:
53-
files: 'dissector/baichuan.lua'
54-
args: --globals Dissector Proto ProtoField base ByteArray DESEGMENT_ONE_MORE_SEGMENT DissectorTable
50+
- uses: actions/checkout@v1
51+
- name: Run luacheck
52+
uses: nebularg/actions-luacheck@v1
53+
with:
54+
files: "dissector/baichuan.lua"
55+
args: --globals Dissector Proto ProtoField base ByteArray DESEGMENT_ONE_MORE_SEGMENT DissectorTable

0 commit comments

Comments
 (0)