Răsfoiți Sursa

[ci] Upgrade to mbedtls 3 to fix mac cmake error (#12361)

* [ci] Upgrade to mbedtls 3 for mac ci

mbedtls 2 fails to build on modern mac due to outdated cmake files

* [ci] Clarify comment about macos 10.13 compat

* [ci] Use official mbedtls release archive

The automatically generated github archive doesn't contain necessary
submodules.
tobil4sk 14 ore în urmă
părinte
comite
320ace7454
2 a modificat fișierele cu 6 adăugiri și 6 ștergeri
  1. 3 3
      .github/workflows/main.yml
  2. 3 3
      extra/github-actions/build-mac.yml

+ 3 - 3
.github/workflows/main.yml

@@ -579,9 +579,9 @@ jobs:
 
       - name: Install dependencies
         env:
-          # For compatibility with macOS 10.13
+          # Build from source for compatibility with macOS 10.13
           ZLIB_VERSION: 1.3.1
-          MBEDTLS_VERSION: 2.28.10
+          MBEDTLS_VERSION: 3.6.4
           PCRE2_VERSION: 10.45
           CMAKE_BUILD_TYPE: Release
           CMAKE_GENERATOR: Ninja
@@ -595,7 +595,7 @@ jobs:
           cmake --build build
           sudo cmake --install build
           cd ..
-          curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
+          curl -L https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-$MBEDTLS_VERSION/mbedtls-$MBEDTLS_VERSION.tar.bz2 | tar xz
           cd mbedtls-$MBEDTLS_VERSION
           cmake -B build -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
             -DENABLE_TESTING=OFF

+ 3 - 3
extra/github-actions/build-mac.yml

@@ -1,8 +1,8 @@
 - name: Install dependencies
   env:
-    # For compatibility with macOS 10.13
+    # Build from source for compatibility with macOS 10.13
     ZLIB_VERSION: 1.3.1
-    MBEDTLS_VERSION: 2.28.10
+    MBEDTLS_VERSION: 3.6.4
     PCRE2_VERSION: 10.45
     CMAKE_BUILD_TYPE: Release
     CMAKE_GENERATOR: Ninja
@@ -16,7 +16,7 @@
     cmake --build build
     sudo cmake --install build
     cd ..
-    curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
+    curl -L https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-$MBEDTLS_VERSION/mbedtls-$MBEDTLS_VERSION.tar.bz2 | tar xz
     cd mbedtls-$MBEDTLS_VERSION
     cmake -B build -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
       -DENABLE_TESTING=OFF