Skip to content

Commit 320ace7

Browse files
authored
[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.
1 parent 3bcc2f4 commit 320ace7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -579,9 +579,9 @@ jobs:
579579

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

extra/github-actions/build-mac.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
- name: Install dependencies
22
env:
3-
# For compatibility with macOS 10.13
3+
# Build from source for compatibility with macOS 10.13
44
ZLIB_VERSION: 1.3.1
5-
MBEDTLS_VERSION: 2.28.10
5+
MBEDTLS_VERSION: 3.6.4
66
PCRE2_VERSION: 10.45
77
CMAKE_BUILD_TYPE: Release
88
CMAKE_GENERATOR: Ninja
@@ -16,7 +16,7 @@
1616
cmake --build build
1717
sudo cmake --install build
1818
cd ..
19-
curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
19+
curl -L https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-$MBEDTLS_VERSION/mbedtls-$MBEDTLS_VERSION.tar.bz2 | tar xz
2020
cd mbedtls-$MBEDTLS_VERSION
2121
cmake -B build -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
2222
-DENABLE_TESTING=OFF

0 commit comments

Comments
 (0)