From d25f531b3913eba857640e0fac9b9db54aa3bd94 Mon Sep 17 00:00:00 2001 From: Dave Hart Date: Tue, 14 Mar 2023 15:33:20 -0400 Subject: [PATCH 1/3] Build TSDK for Release --- .github/workflows/CI.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 494b355..0d01a20 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,13 +21,13 @@ jobs: - name: Build iphoneos run: | - cmake -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DCMAKE_TOOLCHAIN_FILE=../../toolchains/iOS-arm64.cmake -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-iphoneos-arm64 + cmake -DCMAKE_BUILD_TYPE=Release -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DCMAKE_TOOLCHAIN_FILE=../../toolchains/iOS-arm64.cmake -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-iphoneos-arm64 cmake --build ./deps/ziti-tunnel-sdk-c/build-iphoneos-arm64 xcodebuild build -configuration Release -scheme CZiti-iOS -derivedDataPath ./DerivedData/CZiti -arch arm64 -sdk iphoneos - name: Build iphonesimulator run: | - cmake -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DCMAKE_TOOLCHAIN_FILE=../../toolchains/iOS-x86_64.cmake -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-iphonesimulator-x86_64 + cmake -DCMAKE_BUILD_TYPE=Release -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DCMAKE_TOOLCHAIN_FILE=../../toolchains/iOS-x86_64.cmake -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-iphonesimulator-x86_64 cmake --build ./deps/ziti-tunnel-sdk-c/build-iphonesimulator-x86_64 xcodebuild build -configuration Release -scheme CZiti-iOS -derivedDataPath ./DerivedData/CZiti -arch x86_64 -sdk iphonesimulator @@ -56,12 +56,12 @@ jobs: - name: Build x86_64 run: | - cmake -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-macosx-x86_64 + cmake -DCMAKE_BUILD_TYPE=Release -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-macosx-x86_64 cmake --build ./deps/ziti-tunnel-sdk-c/build-macosx-x86_64 - name: Build arm64 run: | - cmake -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DCMAKE_TOOLCHAIN_FILE=../../toolchains/macOS-arm64.cmake -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-macosx-arm64 + cmake -DCMAKE_BUILD_TYPE=Release -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DCMAKE_TOOLCHAIN_FILE=../../toolchains/macOS-arm64.cmake -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-macosx-arm64 cmake --build ./deps/ziti-tunnel-sdk-c/build-macosx-arm64 - name: Build Universal Lib @@ -96,7 +96,7 @@ jobs: - name: Build C SDK run: | - cmake -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-macosx-x86_64 + cmake -DCMAKE_BUILD_TYPE=Release -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/build-macosx-x86_64 cmake --build ./deps/ziti-tunnel-sdk-c/build-macosx-x86_64 - name: Gen Docs From 7100a45bc430201ffbd8f1cd6d35d1d986b4611c Mon Sep 17 00:00:00 2001 From: Dave Hart Date: Tue, 14 Mar 2023 15:34:10 -0400 Subject: [PATCH 2/3] Set build type based on CONFIGURATION setting --- build_all.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_all.sh b/build_all.sh index c4db010..cc13dc2 100755 --- a/build_all.sh +++ b/build_all.sh @@ -40,9 +40,9 @@ function do_build { cd ${c_sdk_build_dir} if [[ "${toolchain}" =~ "${a}" ]] ; then - cmake -GNinja -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DCMAKE_TOOLCHAIN_FILE=../../toolchains/${toolchain} .. && ninja + cmake -GNinja -DCMAKE_BUILD_TYPE=${CONFIGURATION} -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DCMAKE_TOOLCHAIN_FILE=../../toolchains/${toolchain} .. && ninja else - cmake -GNinja -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON .. && ninja + cmake -GNinja -DCMAKE_BUILD_TYPE=${CONFIGURATION} -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON .. && ninja fi if [ $? -ne 0 ] ; then From 7c05bd69d046db250abcc3d398a2448808550b82 Mon Sep 17 00:00:00 2001 From: Dave Hart Date: Tue, 14 Mar 2023 15:35:14 -0400 Subject: [PATCH 3/3] Bump TSDK to v0.20.23 --- deps/ziti-tunnel-sdk-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/ziti-tunnel-sdk-c b/deps/ziti-tunnel-sdk-c index c0068b4..c91c6f5 160000 --- a/deps/ziti-tunnel-sdk-c +++ b/deps/ziti-tunnel-sdk-c @@ -1 +1 @@ -Subproject commit c0068b45ede4ad14930db80d2cf06a2f27329d83 +Subproject commit c91c6f5960d98a3bbc400cc038e9927473a92d6b