Skip to content

Commit 4b1b314

Browse files
authored
Test x11 and wayland features on CI
1 parent c1ea0dd commit 4b1b314

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.github/workflows/ci.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
- { target: i686-pc-windows-gnu, os: windows-latest, host: -i686-pc-windows-gnu }
3838
- { target: i686-unknown-linux-gnu, os: ubuntu-latest, }
3939
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, }
40+
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: x11 }
41+
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: wayland }
4042
- { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }
4143
- { target: x86_64-apple-darwin, os: macos-latest, }
4244
- { target: x86_64-apple-ios, os: macos-latest, }
@@ -50,6 +52,7 @@ jobs:
5052
RUST_BACKTRACE: 1
5153
CARGO_INCREMENTAL: 0
5254
RUSTFLAGS: "-C debuginfo=0"
55+
OPTIONS: ${{ matrix.platform.options }}
5356
FEATURES: ${{ format(',{0}', matrix.platform.features ) }}
5457
CMD: ${{ matrix.platform.cmd }}
5558

@@ -82,35 +85,35 @@ jobs:
8285
- name: Check documentation
8386
shell: bash
8487
if: matrix.platform.target != 'wasm32-unknown-unknown'
85-
run: cargo $CMD doc --no-deps --target ${{ matrix.platform.target }} --features $FEATURES
88+
run: cargo $CMD doc --no-deps --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
8689

8790
- name: Build
8891
shell: bash
89-
run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} --features $FEATURES
92+
run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
9093

9194
- name: Build tests
9295
shell: bash
93-
run: cargo $CMD test --no-run --verbose --target ${{ matrix.platform.target }} --features $FEATURES
96+
run: cargo $CMD test --no-run --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
9497
- name: Run tests
9598
shell: bash
9699
if: (
97100
!contains(matrix.platform.target, 'android') &&
98101
!contains(matrix.platform.target, 'ios') &&
99102
!contains(matrix.platform.target, 'wasm32'))
100-
run: cargo $CMD test --verbose --target ${{ matrix.platform.target }} --features $FEATURES
103+
run: cargo $CMD test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
101104

102105

103106
- name: Build with serde enabled
104107
shell: bash
105-
run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} --features serde,$FEATURES
108+
run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features serde,$FEATURES
106109

107110
- name: Build tests with serde enabled
108111
shell: bash
109-
run: cargo $CMD test --no-run --verbose --target ${{ matrix.platform.target }} --features serde,$FEATURES
112+
run: cargo $CMD test --no-run --verbose --target ${{ matrix.platform.target }} $OPTIONS --features serde,$FEATURES
110113
- name: Run tests with serde enabled
111114
shell: bash
112115
if: (
113116
!contains(matrix.platform.target, 'android') &&
114117
!contains(matrix.platform.target, 'ios') &&
115118
!contains(matrix.platform.target, 'wasm32'))
116-
run: cargo $CMD test --verbose --target ${{ matrix.platform.target }} --features serde,$FEATURES
119+
run: cargo $CMD test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features serde,$FEATURES

0 commit comments

Comments
 (0)