Skip to content

Commit 8a7a9bb

Browse files
committed
Add curl to combo tests and memcheck
Signed-off-by: Ben Collins <bcollins@libjwt.io>
1 parent f4edfe5 commit 8a7a9bb

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090

9191
- name: Install dependencies
9292
run: |
93-
PKGS="build-essential cmake pkg-config libssl-dev check bats jq"
93+
PKGS="build-essential cmake pkg-config libssl-dev check bats jq libcurl4-openssl-dev"
9494
if [ "${{ matrix.json }}" = "json-c" ]; then
9595
PKGS="$PKGS libjson-c-dev"
9696
else
@@ -106,7 +106,7 @@ jobs:
106106
[ "${{ matrix.json }}" = "json-c" ] && JSON_FLAG="-DWITH_JSON_C=YES"
107107
cmake -B build \
108108
-DWITH_OPENSSL=ON -DWITH_GNUTLS=OFF -DWITH_MBEDTLS=OFF \
109-
$JSON_FLAG
109+
-DWITH_LIBCURL=ON $JSON_FLAG
110110
cmake --build build -- all check
111111
112112
# OpenSSL is an optional backend, so the library must build and pass the test
@@ -123,19 +123,19 @@ jobs:
123123
fail-fast: false
124124
matrix:
125125
include:
126-
- { name: "MbedTLS", flags: "-DWITH_OPENSSL=OFF -DWITH_GNUTLS=OFF -DWITH_MBEDTLS=ON" }
127-
- { name: "GnuTLS", flags: "-DWITH_OPENSSL=OFF -DWITH_GNUTLS=ON -DWITH_MBEDTLS=OFF" }
128-
- { name: "OpenSSL", flags: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=OFF -DWITH_MBEDTLS=OFF" }
129-
- { name: "MbedTLS+GnuTLS", flags: "-DWITH_OPENSSL=OFF -DWITH_GNUTLS=ON -DWITH_MBEDTLS=ON" }
130-
- { name: "MbedTLS+OpenSSL", flags: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=OFF -DWITH_MBEDTLS=ON" }
131-
- { name: "GnuTLS+OpenSSL", flags: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=ON -DWITH_MBEDTLS=OFF" }
126+
- { name: "MbedTLS", flags: "-DWITH_OPENSSL=OFF -DWITH_GNUTLS=OFF -DWITH_MBEDTLS=ON -DWITH_LIBCURL=ON" }
127+
- { name: "GnuTLS", flags: "-DWITH_OPENSSL=OFF -DWITH_GNUTLS=ON -DWITH_MBEDTLS=OFF -DWITH_LIBCURL=ON" }
128+
- { name: "OpenSSL", flags: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=OFF -DWITH_MBEDTLS=OFF -DWITH_LIBCURL=ON" }
129+
- { name: "MbedTLS+GnuTLS", flags: "-DWITH_OPENSSL=OFF -DWITH_GNUTLS=ON -DWITH_MBEDTLS=ON -DWITH_LIBCURL=ON" }
130+
- { name: "MbedTLS+OpenSSL", flags: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=OFF -DWITH_MBEDTLS=ON -DWITH_LIBCURL=ON" }
131+
- { name: "GnuTLS+OpenSSL", flags: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=ON -DWITH_MBEDTLS=OFF -DWITH_LIBCURL=ON" }
132132
# The comprehensive row: all three backends + experimental ML-DSA. This
133133
# is the ONLY row that collects coverage (-> Codecov) and runs memcheck.
134134
# On this image GnuTLS is built --with-leancrypto, so WITH_ML_DSA=ON
135135
# exercises the ML-DSA SUCCESS path on both OpenSSL and GnuTLS (and the
136136
# rejection path on MbedTLS) - those lines are run, not just compiled,
137137
# so they count toward Codecov instead of dragging codecov/patch down.
138-
- { name: "all", flags: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=ON -DWITH_MBEDTLS=ON -DWITH_ML_DSA=ON", coverage: true }
138+
- { name: "all", flags: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=ON -DWITH_MBEDTLS=ON -DWITH_ML_DSA=ON -DWITH_LIBCURL=ON", coverage: true }
139139
steps:
140140
- uses: actions/checkout@v5
141141

0 commit comments

Comments
 (0)