diff --git a/.circleci/config.yml b/.circleci/config.yml index bbb01e78..1b10c67c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,9 +61,9 @@ jobs: command: | mkdir -p ~/deps cd ~/deps - curl https://www.zlib.net/zlib-1.3.1.tar.xz | tar xz - cd zlib-1.3.1 - if [ ! -f /usr/local/lib/libz.1.3.1.dylib ]; then + curl https://www.zlib.net/zlib-1.3.2.tar.xz | tar xz + cd zlib-1.3.2 + if [ ! -f /usr/local/lib/libz.1.3.2.dylib ]; then cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DCMAKE_MACOSX_RPATH=TRUE cmake --build build --config Release -j$NPROC sudo cmake --install build @@ -246,7 +246,7 @@ jobs: - /usr/local/lib/libvorbis.0.4.9.dylib - /usr/local/lib/libvorbisfile.3.3.8.dylib - /usr/local/lib/libvorbisenc.2.0.12.dylib - - /usr/local/lib/libz.1.3.1.dylib + - /usr/local/lib/libz.1.3.2.dylib - /usr/local/lib/datachannel.hdll @@ -280,7 +280,7 @@ jobs: cp /usr/local/lib/libvorbis.0.4.9.dylib libvorbis.0.4.9.dylib cp /usr/local/lib/libvorbisfile.3.3.8.dylib libvorbisfile.3.3.8.dylib cp /usr/local/lib/libvorbisenc.2.0.12.dylib libvorbisenc.2.0.12.dylib - cp /usr/local/lib/libz.1.3.1.dylib libz.1.dylib + cp /usr/local/lib/libz.1.3.2.dylib libz.1.dylib cp /usr/local/lib/libuv.1.dylib libuv.1.dylib # These libraries have dangling RPATHs install_name_tool -delete_rpath /usr/local/lib libturbojpeg.0.dylib @@ -387,7 +387,7 @@ jobs: cd ~/deps git clone https://github.com/RandomityGuy/hxDatachannel cd hxDatachannel/cpp - "/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHASHLINK_LIBRARY_DIR="~/deps/hashlink/x64/Release" -DHASHLINK_INCLUDE_DIR="../../hashlink/src" + "/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHASHLINK_LIBRARY_DIR="~/deps/hashlink/x64/Release" -DHASHLINK_INCLUDE_DIR="../../hashlink/src" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 "/c/Program Files/CMake/bin/cmake" --build build --config Release -j4 mv ~/deps/hxDatachannel/cpp/build/Release/datachannel.hdll ~/deps/hashlink/x64/Release mv ~/deps/hxDatachannel/cpp/build/Release/datachannel.lib ~/deps/hashlink/x64/Release