Skip to content

Commit 6a9ed88

Browse files
committed
GHA: Update mbedtls to v4
Switch from Make to CMake. Change-Id: I658b1b24da304938225a8f834d7484671a63360f Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
1 parent e7431fc commit 6a9ed88

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

.github/workflows/build.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,12 @@ jobs:
369369
- name: make check
370370
run: make -j3 check VERBOSE=1
371371

372-
mbedtls3:
372+
mbedtls4:
373373
strategy:
374374
fail-fast: false
375375
matrix:
376376
os: [ubuntu-22.04]
377-
ssllib: [mbedtls3]
377+
ssllib: [mbedtls4]
378378
build: [ normal, asan ]
379379
include:
380380
- build: asan
@@ -401,15 +401,19 @@ jobs:
401401
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
402402
with:
403403
path: mbedtls
404-
submodules: true
404+
submodules: recursive
405405
# versioning=semver-coerced
406406
repository: Mbed-TLS/mbedtls
407407
ref: v4.0.0
408-
- name: "mbedtls: make no_test"
409-
run: make -j3 no_test SHARED=1
408+
- uses: lukka/get-cmake@2ecc21724e5215b0e567bc399a2602d2ecb48541 # v4.1.1
409+
- name: "mbedtls: cmake"
410+
run: cmake -B build
411+
working-directory: mbedtls
412+
- name: "mbedtls: cmake --build"
413+
run: cmake --build build
410414
working-directory: mbedtls
411-
- name: "mbedtls: make install"
412-
run: sudo make install DESTDIR=/usr
415+
- name: "mbedtls: cmake --install"
416+
run: sudo cmake --install build --prefix /usr
413417
working-directory: mbedtls
414418
- name: Checkout OpenVPN
415419
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

0 commit comments

Comments
 (0)