Skip to content

Commit 2dee77c

Browse files
authored
Use CPM manage mbedtls (#422)
1 parent 0f20f9a commit 2dee77c

File tree

9 files changed

+1372
-156
lines changed

9 files changed

+1372
-156
lines changed

.github/workflows/freebsd-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
sync: rsync
3232
copyback: false
3333
prepare: |
34+
pkg install -y git
3435
pkg install -y cmake
3536
pkg install -y python3
3637
# required by mbedtls-3.3.0

.github/workflows/ios-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
- .github/workflows/ios-ci.yml
1212
- ci/**/*
1313
- extensions/**/*
14-
- cmake/ios.cmake
1514

1615
jobs:
1716
build:

.github/workflows/pr-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
shell: pwsh
6969
run: ./build.ps1
7070
android:
71-
runs-on: ubuntu-latest
71+
runs-on: windows-latest
7272
strategy:
7373
matrix:
7474
arch:
@@ -78,8 +78,6 @@ jobs:
7878
- x64
7979
env:
8080
BUILD_ARCH: ${{ matrix.arch }}
81-
# r16b can't runs on latest ubuntu, test works on ubuntu-18.04
82-
NDK_VER: r19c
8381
steps:
8482
- uses: actions/checkout@v3
8583
with:
@@ -126,6 +124,7 @@ jobs:
126124
with:
127125
usesh: true
128126
prepare: |
127+
pkg install -y git
129128
pkg install -y cmake
130129
pkg install -y python3
131130
# required by mbedtls-3.3.0

.github/workflows/solaris-ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
sync: rsync
3232
copyback: false
3333
prepare: |
34+
# git
35+
pkgutil -y -i git
3436
# cmake
3537
pkgutil -y -i cmake
3638
# required by mbedtls-3.3.0

0 commit comments

Comments
 (0)