From e7431fc617646599b1a5a7bb38097d5ab8ff924b Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Wed, 15 Oct 2025 16:48:43 +0000 Subject: [PATCH 1/2] chore(deps): update dependency mbed-tls/mbedtls to v4 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e068f585104..a4f27bc9f2a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -404,7 +404,7 @@ jobs: submodules: true # versioning=semver-coerced repository: Mbed-TLS/mbedtls - ref: v3.6.4 + ref: v4.0.0 - name: "mbedtls: make no_test" run: make -j3 no_test SHARED=1 working-directory: mbedtls From 6a9ed8893bad35604e333b8ae68cb2e66b490fb6 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Thu, 16 Oct 2025 14:42:55 +0200 Subject: [PATCH 2/2] GHA: Update mbedtls to v4 Switch from Make to CMake. Change-Id: I658b1b24da304938225a8f834d7484671a63360f Signed-off-by: Frank Lichtenheld --- .github/workflows/build.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a4f27bc9f2a..a767aef4b2a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -369,12 +369,12 @@ jobs: - name: make check run: make -j3 check VERBOSE=1 - mbedtls3: + mbedtls4: strategy: fail-fast: false matrix: os: [ubuntu-22.04] - ssllib: [mbedtls3] + ssllib: [mbedtls4] build: [ normal, asan ] include: - build: asan @@ -401,15 +401,19 @@ jobs: uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: path: mbedtls - submodules: true + submodules: recursive # versioning=semver-coerced repository: Mbed-TLS/mbedtls ref: v4.0.0 - - name: "mbedtls: make no_test" - run: make -j3 no_test SHARED=1 + - uses: lukka/get-cmake@2ecc21724e5215b0e567bc399a2602d2ecb48541 # v4.1.1 + - name: "mbedtls: cmake" + run: cmake -B build + working-directory: mbedtls + - name: "mbedtls: cmake --build" + run: cmake --build build working-directory: mbedtls - - name: "mbedtls: make install" - run: sudo make install DESTDIR=/usr + - name: "mbedtls: cmake --install" + run: sudo cmake --install build --prefix /usr working-directory: mbedtls - name: Checkout OpenVPN uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0