]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
GHA/linux: add cmake job for system mbedTLS with pkg-config
authorViktor Szakats <commit@vsz.me>
Mon, 14 Oct 2024 00:54:03 +0000 (02:54 +0200)
committerViktor Szakats <commit@vsz.me>
Mon, 14 Oct 2024 23:40:20 +0000 (01:40 +0200)
Add a build-only cmake job with system mbedTLS package and `pkg-config`
enabled. Ubuntu 24.04 comes with mbedTLS 2.28.8 which supports
`pkg-config`.

Follow-up to 7bab201abe3915a0167c002f9308950cb8a06e4b #15193
Closes #15286

.github/workflows/linux.yml

index 376bcd84e2d6f620edc6d889a6fcdc34a45f175f..54d42460563c87d9a2df4290d5cc036144696702 100644 (file)
@@ -116,11 +116,16 @@ jobs:
           - name: mbedtls
             install_packages: libnghttp2-dev
             install_steps: mbedtls
-            PKG_CONFIG_PATH: '$HOME/mbedtls/lib/pkgconfig'  # Requires v3.6.0 or upper
+            PKG_CONFIG_PATH: '$HOME/mbedtls/lib/pkgconfig'  # Requires v3.6.0 or v2.28.8
             generate: -DCURL_USE_MBEDTLS=ON -DENABLE_DEBUG=ON
 
           - name: mbedtls-pkg
             install_packages: libnghttp2-dev libmbedtls-dev
+            generate: -DCURL_USE_MBEDTLS=ON -DENABLE_DEBUG=ON
+
+          - name: mbedtls-pkg !pc
+            install_packages: libnghttp2-dev libmbedtls-dev
+            install_steps: skipall
             generate: -DCURL_USE_MBEDTLS=ON -DENABLE_DEBUG=ON -DCURL_USE_PKGCONFIG=OFF
 
           - name: msh3