Skip to content

Commit 8e4dcb1

Browse files
committed
.github/workflows/os-check.yml: address review nits on the split refactor
- Drop the section dividers in make_check_linux's config list. The two groups they marked were "old make_check configs" vs "old make_check_linux configs" -- an artifact of the merge, not a real semantic distinction (e.g. SHE / harden-tls / sniffer entries have no Darwin paths to be "covered by make_check_macos" at all). Replaced with a single "Add new configs here" comment. - Drop the parens from job display names: "make check (Linux)" / "make check (macOS)" rendered as "make check (Linux) (<config>)" in the GitHub UI under a 1-D matrix. Now "make check linux" / "make check macos". - Tighten the --disable-sys-ca-certs comment in make_check_macos. The meaningful signal is the configure-time auto-enable override and the Security.framework code path being compiled out cleanly; the runtime test on the resulting binary doesn't differ much from Linux. - Drop the dead-weight single-element os: [ ubuntu-24.04 ] matrix axis on make_user_settings_testwolfcrypt, matching the same cleanup already done on make_user_settings and make_user_all.
1 parent fbd65a7 commit 8e4dcb1

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

.github/workflows/os-check.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
config: [
24-
# Add new configs here.
25-
# --- Configs whose macOS-relevant paths are covered by
26-
# make_check_macos (sys-ca-certs, --enable-all, DTLS-CID,
27-
# cryptocb dispatch). ---
24+
# Add new configs here
2825
'',
2926
'--enable-all --enable-asn=template',
3027
'--enable-all --enable-asn=original',
@@ -91,9 +88,6 @@ jobs:
9188
'--enable-ocsp --enable-ocsp-responder --enable-ocspstapling CPPFLAGS="-DWOLFSSL_NONBLOCK_OCSP" --enable-maxfragment',
9289
'--enable-all CPPFLAGS=-DWOLFSSL_HASH_KEEP',
9390
'--enable-all --enable-writedup',
94-
# --- Configs that exercise no Darwin-specific code at all
95-
# (pure crypto algorithms, preprocessor guards, features
96-
# with no platform-specific code paths). ---
9791
'--enable-ascon --enable-experimental',
9892
'--enable-ascon CPPFLAGS=-DWOLFSSL_ASCON_UNROLL --enable-experimental',
9993
# PKCS#7 with RSA-PSS (CMS RSASSA-PSS signers)
@@ -115,7 +109,7 @@ jobs:
115109
'--enable-curve25519=nonblock --enable-ecc=nonblock --enable-sp=yes,nonblock CPPFLAGS="-DWOLFSSL_PUBLIC_MP -DWOLFSSL_DEBUG_NONBLOCK"',
116110
'--enable-certreq --enable-certext --enable-certgen --disable-secure-renegotiation-info CPPFLAGS="-DNO_TLS"',
117111
]
118-
name: make check (Linux)
112+
name: make check linux
119113
if: github.repository_owner == 'wolfssl'
120114
runs-on: ubuntu-24.04
121115
# This should be a safe limit for the tests to run.
@@ -144,8 +138,9 @@ jobs:
144138
# sniffer, DTLS, OCSP, ...). Note: --enable-all does NOT enable
145139
# cryptocb or SHE, so those have their own entries below.
146140
'--enable-all --enable-asn=template',
147-
# Negative test: ensure the explicit-disable path still builds and
148-
# runs cleanly on the only OS that auto-enables sys-ca-certs.
141+
# Validates the configure-time auto-enable override and that the
142+
# build compiles out the Security.framework code path cleanly --
143+
# macOS is the only OS where sys-ca-certs is auto-on by default.
149144
'--disable-sys-ca-certs',
150145
# DTLS over BSD sockets on Darwin: connection-ID, fragmented
151146
# ClientHello, secure renegotiation, PSK, AES-CCM, null cipher --
@@ -158,7 +153,7 @@ jobs:
158153
# compiles and runs on the macOS toolchain.
159154
'--enable-cryptocb --enable-keygen --enable-cryptocbutils=setkey',
160155
]
161-
name: make check (macOS)
156+
name: make check macos
162157
if: github.repository_owner == 'wolfssl'
163158
runs-on: macos-latest
164159
# This should be a safe limit for the tests to run.
@@ -198,12 +193,11 @@ jobs:
198193
user-settings: ${{ matrix.user-settings }}
199194

200195
make_user_settings_testwolfcrypt:
196+
# testwolfcrypt runs pure crypto tests with no platform-specific
197+
# features, so Linux-only is sufficient for these user_settings.
201198
strategy:
202199
fail-fast: false
203200
matrix:
204-
# testwolfcrypt runs pure crypto tests with no platform-specific
205-
# features, so Linux-only is sufficient for these user_settings.
206-
os: [ ubuntu-24.04 ]
207201
user-settings: [
208202
# Add new user_settings.h here (alphabetical order)
209203
'examples/configs/user_settings_ca.h',
@@ -227,7 +221,7 @@ jobs:
227221
]
228222
name: make user_setting.h (testwolfcrypt only)
229223
if: github.repository_owner == 'wolfssl'
230-
runs-on: ${{ matrix.os }}
224+
runs-on: ubuntu-24.04
231225
# This should be a safe limit for the tests to run.
232226
timeout-minutes: 14
233227
steps:

0 commit comments

Comments
 (0)