Skip to content

Commit d1a4d06

Browse files
committed
ci: simplify test matrix
1 parent fecb504 commit d1a4d06

File tree

1 file changed

+23
-87
lines changed

1 file changed

+23
-87
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -113,114 +113,50 @@ jobs:
113113
- --features=alloc
114114
- --all-features
115115
- --no-default-features
116-
- --no-default-features --features alloc,std,aws_lc_rs
117-
- --no-default-features --features alloc,std,ring
116+
- --no-default-features --features alloc
117+
- --no-default-features --features aws-lc-rs
118+
- --no-default-features --features ring
119+
- --no-default-features --features alloc,aws-lc-rs
120+
- --no-default-features --features alloc,ring
121+
- --features aws-lc-rs # `std` is enabled by default
122+
- --features ring # `std` is enabled by default
118123

119-
mode:
120-
- # debug
121-
- --release
124+
host_os:
125+
- ubuntu-latest
122126

123127
rust_channel:
124128
- stable
125-
- nightly
126-
- beta
127-
128-
exclude:
129-
- features: # Default
130-
- features: --features=alloc
131-
- features: --no-default-features
132-
- features: --no-default-features --features alloc,std
133-
- features: --no-default-features --features alloc,std,aws_lc_rs
134-
- features: --no-default-features --features alloc,std,ring
135-
- features: --all-features
136-
mode: --release
137-
- features: --all-features
138-
mode: # debug
139-
rust_channel: nightly
140-
- features: --all-features
141-
mode: # debug
142-
rust_channel: beta
143129

144130
include:
145-
- features: # Default
146-
mode: # debug
147-
rust_channel: stable
148-
host_os: ubuntu-latest
149-
150-
- features: --features=alloc
151-
mode: # debug
152-
rust_channel: stable
153-
host_os: ubuntu-latest
154-
155-
- features: --no-default-features
156-
mode: # debug
157-
rust_channel: stable
158-
host_os: ubuntu-latest
159-
160-
- features: --no-default-features --features alloc,std
161-
mode: # debug
162-
rust_channel: stable
163-
host_os: ubuntu-latest
164-
165-
- features: --all-features
166-
mode: --release
167-
rust_channel: stable
168-
host_os: ubuntu-latest
169-
170-
- features: --all-features
171-
mode: # debug
172-
rust_channel: nightly
173-
host_os: ubuntu-latest
174-
175-
- features: --all-features
176-
mode: # debug
131+
# Test aws-lc-rs across Rust channels
132+
- features: --features aws-lc-rs
177133
rust_channel: beta
178134
host_os: ubuntu-latest
179135

180-
- features: --all-features
181-
mode: # debug
182-
rust_channel: stable
183-
host_os: macos-latest
184-
185-
- features: --all-features
186-
mode: # debug
187-
rust_channel: stable
188-
host_os: windows-latest
189-
190-
- features: --all-features
191-
mode: # debug
192-
rust_channel: stable
136+
- features: --features aws-lc-rs
137+
rust_channel: nightly
193138
host_os: ubuntu-latest
194139

195-
# check aws-lc-rs alone
196-
- features: --no-default-features --features alloc,std,aws-lc-rs
197-
mode: # debug
140+
# Test aws-lc-rs across OSes
141+
- features: --features-aws-lc-rs
198142
rust_channel: stable
199143
host_os: macos-latest
200144

201-
- features: --no-default-features --features alloc,std,aws-lc-rs
202-
mode: # debug
145+
- features: --features aws-lc-rs
203146
rust_channel: stable
204147
host_os: windows-latest
205148

206-
- features: --no-default-features --features alloc,std,aws-lc-rs
207-
mode: # debug
208-
rust_channel: stable
209-
host_os: ubuntu-latest
210-
211-
# check ring alone
212-
- features: --no-default-features --features alloc,std,ring
213-
mode: # debug
149+
# Test ring across OSes
150+
- features: --features ring
214151
rust_channel: stable
215152
host_os: macos-latest
216153

217-
- features: --no-default-features --features alloc,std,ring
218-
mode: # debug
154+
- features: --features ring
219155
rust_channel: stable
220156
host_os: windows-latest
221157

222-
- features: --no-default-features --features alloc,std,ring
223-
mode: # debug
158+
# Test aws-lc-rs-fips on Linux only (stable only)
159+
- features: --features aws-lc-rs-fips
224160
rust_channel: stable
225161
host_os: ubuntu-latest
226162

@@ -239,8 +175,8 @@ jobs:
239175
if: runner.os == 'Windows'
240176
uses: seanmiddleditch/gha-setup-ninja@v6
241177

242-
- name: cargo test (${{ matrix.mode }}, ${{ matrix.features }})
243-
run: cargo test --locked ${{ matrix.features }} ${{ matrix.mode }} -- --include-ignored
178+
- name: cargo test (${{ matrix.features }})
179+
run: cargo test --locked ${{ matrix.features }} -- --include-ignored
244180
env:
245181
RUSTFLAGS: "-D warnings"
246182
AWS_LC_SYS_PREBUILT_NASM: "1" # for benefit of rcgen

0 commit comments

Comments
 (0)