From: W.C.A. Wijngaards Date: Mon, 22 Mar 2021 13:53:05 +0000 (+0100) Subject: - Comment out nonworking OSX and IOS travis tests, vm fails to start. X-Git-Tag: release-1.13.2rc1~238 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e92270bae44a2941a690188a7a666c6cdde29730;p=thirdparty%2Funbound.git - Comment out nonworking OSX and IOS travis tests, vm fails to start. --- diff --git a/.travis.yml b/.travis.yml index 37ea672b3..19b5602bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,13 +31,13 @@ jobs: arch: amd64 env: - CONFIG_OPTS="--enable-debug --disable-flto" - - os: osx - name: Clang on OS X, Amd64 - compiler: clang - arch: amd64 - env: - - TEST_OSX=yes - - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl/" +# - os: osx +# name: Clang on OS X, Amd64 +# compiler: clang +# arch: amd64 +# env: +# - TEST_OSX=yes +# - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl/" - os: linux name: Libevent, GCC on Linux, Amd64 compiler: gcc @@ -52,14 +52,14 @@ jobs: env: - TEST_LIBEVENT=yes - CONFIG_OPTS="--with-libevent" - - os: osx - name: Libevent, Clang on OS X, Amd64 - compiler: clang - arch: amd64 - env: - - TEST_OSX=yes - - TEST_LIBEVENT=yes - - CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl/ --with-libevent=/usr/local/opt/libevent/" +# - os: osx +# name: Libevent, Clang on OS X, Amd64 +# compiler: clang +# arch: amd64 +# env: +# - TEST_OSX=yes +# - TEST_LIBEVENT=yes +# - CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl/ --with-libevent=/usr/local/opt/libevent/" - os: linux name: UBsan, GCC on Linux, Amd64 compiler: gcc @@ -130,90 +130,90 @@ jobs: dist: bionic env: - CONFIG_OPTS="--enable-debug --disable-flto" - - os: osx - osx_image: xcode10 - name: Apple iPhone on iOS, armv7 - compiler: clang - env: - - TEST_IOS=yes - - AUTOTOOLS_HOST=armv7-apple-ios - - OPENSSL_HOST=ios-cross - - IOS_SDK=iPhoneOS - - IOS_CPU=armv7s - - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" - - os: osx - osx_image: xcode10 - name: Apple iPhone on iOS, arm64 - compiler: clang - env: - - TEST_IOS=yes - - AUTOTOOLS_HOST=aarch64-apple-ios - - OPENSSL_HOST=ios64-cross - - IOS_SDK=iPhoneOS - - IOS_CPU=arm64 - - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" - - os: osx - osx_image: xcode10 - name: Apple TV on iOS, arm64 - compiler: clang - env: - - TEST_IOS=yes - - AUTOTOOLS_HOST=aarch64-apple-ios - - OPENSSL_HOST=ios64-cross - - IOS_SDK=AppleTVOS - - IOS_CPU=arm64 - - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" - - os: osx - osx_image: xcode10 - name: Apple Watch on iOS, armv7 - compiler: clang - env: - - TEST_IOS=yes - - AUTOTOOLS_HOST=armv7-apple-ios - - OPENSSL_HOST=ios-cross - - IOS_SDK=WatchOS - - IOS_CPU=armv7k - - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" - - os: osx - osx_image: xcode10 - name: iPhoneSimulator on OS X, i386 - env: - - TEST_IOS=yes - - AUTOTOOLS_HOST=i386-apple-ios - - OPENSSL_HOST=iphoneos-cross - - IOS_CPU=i386 - - IOS_SDK=iPhoneSimulator - - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" - - os: osx - osx_image: xcode10 - name: iPhoneSimulator on OS X, x86_64 - env: - - TEST_IOS=yes - - AUTOTOOLS_HOST=x86_64-apple-ios - - OPENSSL_HOST=iphoneos-cross - - IOS_CPU=x86_64 - - IOS_SDK=iPhoneSimulator - - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" - - os: osx - osx_image: xcode10 - name: AppleTVSimulator on OS X, x86_64 - env: - - TEST_IOS=yes - - AUTOTOOLS_HOST=x86_64-apple-ios - - OPENSSL_HOST=iphoneos-cross - - IOS_CPU=x86_64 - - IOS_SDK=AppleTVSimulator - - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" - - os: osx - osx_image: xcode10 - name: WatchSimulator on OS X, i386 - env: - - TEST_IOS=yes - - AUTOTOOLS_HOST=i386-apple-ios - - OPENSSL_HOST=iphoneos-cross - - IOS_CPU=i386 - - IOS_SDK=WatchSimulator - - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" +# - os: osx +# osx_image: xcode10 +# name: Apple iPhone on iOS, armv7 +# compiler: clang +# env: +# - TEST_IOS=yes +# - AUTOTOOLS_HOST=armv7-apple-ios +# - OPENSSL_HOST=ios-cross +# - IOS_SDK=iPhoneOS +# - IOS_CPU=armv7s +# - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" +# - os: osx +# osx_image: xcode10 +# name: Apple iPhone on iOS, arm64 +# compiler: clang +# env: +# - TEST_IOS=yes +# - AUTOTOOLS_HOST=aarch64-apple-ios +# - OPENSSL_HOST=ios64-cross +# - IOS_SDK=iPhoneOS +# - IOS_CPU=arm64 +# - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" +# - os: osx +# osx_image: xcode10 +# name: Apple TV on iOS, arm64 +# compiler: clang +# env: +# - TEST_IOS=yes +# - AUTOTOOLS_HOST=aarch64-apple-ios +# - OPENSSL_HOST=ios64-cross +# - IOS_SDK=AppleTVOS +# - IOS_CPU=arm64 +# - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" +# - os: osx +# osx_image: xcode10 +# name: Apple Watch on iOS, armv7 +# compiler: clang +# env: +# - TEST_IOS=yes +# - AUTOTOOLS_HOST=armv7-apple-ios +# - OPENSSL_HOST=ios-cross +# - IOS_SDK=WatchOS +# - IOS_CPU=armv7k +# - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" +# - os: osx +# osx_image: xcode10 +# name: iPhoneSimulator on OS X, i386 +# env: +# - TEST_IOS=yes +# - AUTOTOOLS_HOST=i386-apple-ios +# - OPENSSL_HOST=iphoneos-cross +# - IOS_CPU=i386 +# - IOS_SDK=iPhoneSimulator +# - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" +# - os: osx +# osx_image: xcode10 +# name: iPhoneSimulator on OS X, x86_64 +# env: +# - TEST_IOS=yes +# - AUTOTOOLS_HOST=x86_64-apple-ios +# - OPENSSL_HOST=iphoneos-cross +# - IOS_CPU=x86_64 +# - IOS_SDK=iPhoneSimulator +# - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" +# - os: osx +# osx_image: xcode10 +# name: AppleTVSimulator on OS X, x86_64 +# env: +# - TEST_IOS=yes +# - AUTOTOOLS_HOST=x86_64-apple-ios +# - OPENSSL_HOST=iphoneos-cross +# - IOS_CPU=x86_64 +# - IOS_SDK=AppleTVSimulator +# - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" +# - os: osx +# osx_image: xcode10 +# name: WatchSimulator on OS X, i386 +# env: +# - TEST_IOS=yes +# - AUTOTOOLS_HOST=i386-apple-ios +# - OPENSSL_HOST=iphoneos-cross +# - IOS_CPU=i386 +# - IOS_SDK=WatchSimulator +# - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" - os: linux name: Android armv7a, Linux, Amd64 compiler: clang diff --git a/doc/Changelog b/doc/Changelog index 2d1cb04a0..3761d3d46 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ 22 March 2021: Wouter - Merge #449 from orbea: build: Add missing linker flags. - iana portlist update. + - Comment out nonworking OSX and IOS travis tests, vm fails to start. 19 March 2021: Wouter - Fix for #447: squelch connection refused tcp connection failures