Skip to content

Commit d2ce31b

Browse files
committed
Tweak CI to be more comprehensive on feature testing.
1 parent 783142b commit d2ce31b

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v2
3636

37-
- name: install libx11-dev
37+
- name: install linux dependencies
3838
run: |
3939
sudo apt update
40-
sudo apt install libx11-dev libpango1.0-dev libxkbcommon-dev libxkbcommon-x11-dev
40+
sudo apt install libpango1.0-dev libxkbcommon-dev libxkbcommon-x11-dev
4141
if: contains(matrix.os, 'ubuntu')
4242

4343
- name: install stable toolchain
@@ -56,13 +56,13 @@ jobs:
5656
uses: actions-rs/cargo@v1
5757
with:
5858
command: clippy
59-
args: --manifest-path=druid-shell/Cargo.toml --all-targets --features=x11,raw-win-handle --no-default-features -- -D warnings
59+
args: --manifest-path=druid-shell/Cargo.toml --all-targets --no-default-features --features=x11,image,raw-win-handle -- -D warnings
6060

6161
- name: cargo clippy druid
6262
uses: actions-rs/cargo@v1
6363
with:
6464
command: clippy
65-
args: --manifest-path=druid/Cargo.toml --all-targets --no-default-features --features=svg,image,im,x11,raw-win-handle -- -D warnings
65+
args: --manifest-path=druid/Cargo.toml --all-targets --no-default-features --features=svg,image,im,x11,raw-win-handle -- -D warnings
6666

6767
- name: cargo clippy druid-derive
6868
uses: actions-rs/cargo@v1
@@ -84,7 +84,7 @@ jobs:
8484
uses: actions-rs/cargo@v1
8585
with:
8686
command: test
87-
args: --manifest-path=druid-shell/Cargo.toml --no-default-features --features=x11
87+
args: --manifest-path=druid-shell/Cargo.toml --no-default-features --features=x11,image,raw-win-handle
8888

8989
# We use --all-targets to skip doc tests; we run them in a parallel task
9090
# there are no gtk-specific doctests in the main druid crate anyway
@@ -135,21 +135,21 @@ jobs:
135135
uses: actions-rs/cargo@v1
136136
with:
137137
command: clippy
138-
args: --manifest-path=druid-shell/Cargo.toml --all-targets --features=wayland,raw-win-handle --no-default-features -- -D warnings
138+
args: --manifest-path=druid-shell/Cargo.toml --all-targets --no-default-features --features=wayland,image,raw-win-handle -- -D warnings
139139

140140
- name: cargo test druid-shell
141141
uses: actions-rs/cargo@v1
142142
with:
143143
command: test
144-
args: --manifest-path=druid-shell/Cargo.toml --features wayland --no-default-features
144+
args: --manifest-path=druid-shell/Cargo.toml --no-default-features --features=wayland,image,raw-win-handle
145145

146146
# We use --all-targets to skip doc tests; there are no wayland-specific
147147
# doctests in the main druid crate anyway
148148
- name: cargo test druid
149149
uses: actions-rs/cargo@v1
150150
with:
151151
command: test
152-
args: --manifest-path=druid/Cargo.toml --all-targets --features=svg,image,im --features wayland --no-default-features
152+
args: --manifest-path=druid/Cargo.toml --all-targets --no-default-features --features=wayland,svg,image,im,raw-win-handle
153153

154154
# we test the gtk backend as a separate job because gtk install takes
155155
# a long time.
@@ -179,13 +179,13 @@ jobs:
179179
uses: actions-rs/cargo@v1
180180
with:
181181
command: clippy
182-
args: --manifest-path=druid-shell/Cargo.toml --all-targets --features=raw-win-handle -- -D warnings
182+
args: --manifest-path=druid-shell/Cargo.toml --all-targets --features=image,raw-win-handle -- -D warnings
183183

184184
- name: cargo test druid-shell
185185
uses: actions-rs/cargo@v1
186186
with:
187187
command: test
188-
args: --manifest-path=druid-shell/Cargo.toml
188+
args: --manifest-path=druid-shell/Cargo.toml --features=image,raw-win-handle
189189

190190
# We use --all-targets to skip doc tests; there are no gtk-specific
191191
# doctests in the main druid crate anyway
@@ -230,7 +230,7 @@ jobs:
230230
uses: actions-rs/cargo@v1
231231
with:
232232
command: test
233-
args: --manifest-path=druid-shell/Cargo.toml --no-run --target wasm32-unknown-unknown
233+
args: --manifest-path=druid-shell/Cargo.toml --features=image --no-run --target wasm32-unknown-unknown
234234

235235
# We use --all-targets to skip doc tests; there are no wasm-specific
236236
# doctests in the main druid crate anyway
@@ -275,7 +275,7 @@ jobs:
275275
uses: actions-rs/cargo@v1
276276
with:
277277
command: test
278-
args: --manifest-path=druid/Cargo.toml --doc --no-default-features --features=svg,image,im
278+
args: --manifest-path=druid/Cargo.toml --doc --no-default-features --features=svg,image,im,raw-win-handle
279279

280280
# This tests the future rust compiler to catch errors ahead of time without
281281
# breaking CI
@@ -304,7 +304,7 @@ jobs:
304304
uses: actions-rs/cargo@v1
305305
with:
306306
command: clippy
307-
args: --manifest-path=druid-shell/Cargo.toml --all-targets --features=raw-win-handle -- -D warnings
307+
args: --manifest-path=druid-shell/Cargo.toml --all-targets --features=image,raw-win-handle -- -D warnings
308308
continue-on-error: true
309309

310310
- name: cargo clippy druid
@@ -319,7 +319,7 @@ jobs:
319319
uses: actions-rs/cargo@v1
320320
with:
321321
command: test
322-
args: --manifest-path=druid-shell/Cargo.toml --no-default-features --features=x11
322+
args: --manifest-path=druid-shell/Cargo.toml --no-default-features --features=x11,image
323323
continue-on-error: true
324324

325325
# We use --all-targets to skip doc tests, which are run in doctest-stable

0 commit comments

Comments
 (0)