diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0b8a5c0..9968225 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,9 +39,8 @@ jobs: TOOLCHAIN: ${{ matrix.spec.toolchain && format('../../toolchains/{0}.cmake', matrix.spec.toolchain) || '' }} run: | cmake -DCMAKE_BUILD_TYPE=Release -DTLSUV_TLSLIB=mbedtls -DMBEDTLS_FATAL_WARNINGS:BOOL=OFF -DEXCLUDE_PROGRAMS=ON -DZITI_TUNNEL_BUILD_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN}" -S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/${{ matrix.spec.name }} - cmake --build ./deps/ziti-tunnel-sdk-c/${{ matrix.spec.name }} --verbose + cmake --build ./deps/ziti-tunnel-sdk-c/${{ matrix.spec.name }} tar -cvzf ${{ matrix.spec.name }}.tgz -C ./deps/ziti-tunnel-sdk-c ${{ matrix.spec.name }} - tar -cvzf ${{ matrix.spec.name }}-vcpkg.tgz ./vcpkg - name: Upload Build uses: actions/upload-artifact@v3 @@ -49,12 +48,6 @@ jobs: name: ${{ matrix.spec.name }} path: ${{ matrix.spec.name }}.tgz - - name: Upload vcpkg buildtree - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.spec.name }}-vcpkg - path: ${{ matrix.spec.name }}-vcpkg.tgz - build-cziti: runs-on: macos-latest needs: [ build-tsdk ] @@ -82,16 +75,17 @@ jobs: - name: Build CZiti run: | + set -o pipefail xcodebuild build -configuration Release -scheme CZiti-iOS -derivedDataPath ./DerivedData/CZiti \ - -arch arm64 -sdk iphoneos + -arch arm64 -sdk iphoneos | xcpretty xcodebuild build -configuration Release -scheme CZiti-iOS -derivedDataPath ./DerivedData/CZiti \ - -arch x86_64 -arch arm64 ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator || echo hi + -arch x86_64 -arch arm64 ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator | xcpretty xcodebuild build -configuration Release -scheme CZiti-macOS -derivedDataPath ./DerivedData/CZiti \ - -arch x86_64 -arch arm64 ONLY_ACTIVE_ARCH=NO -sdk macosx + -arch x86_64 -arch arm64 ONLY_ACTIVE_ARCH=NO -sdk macosx | xcpretty - name: Create Frameworks run: | - FOR=macOS ./make_dist.sh + ./make_dist.sh pushd ./dist && zip -r ../CZiti.xcframework.zip CZiti.xcframework && popd - name: Upload CZiti.xcframework