From 61e6a3910f7e009b06912018f52078d2813e68b1 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Tue, 23 Mar 2021 14:22:00 +0100 Subject: [PATCH] Travis, note changelog, disable homebrew update in script and cfg. --- .travis.yml | 1 + contrib/ios/install_tools.sh | 3 ++- doc/Changelog | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 765dc6eb1..301420005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,6 +155,7 @@ jobs: - IOS_SDK=iPhoneOS - IOS_CPU=arm64 - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU" + - HOMEBREW_NO_AUTO_UPDATE=1 # - os: osx # osx_image: xcode10 # name: Apple TV on iOS, arm64 diff --git a/contrib/ios/install_tools.sh b/contrib/ios/install_tools.sh index 93c730a4d..e2f381425 100755 --- a/contrib/ios/install_tools.sh +++ b/contrib/ios/install_tools.sh @@ -6,4 +6,5 @@ #brew update 1>/dev/null echo "Installing tools" # already installed are: autoconf automake libtool pkg-config -brew install curl perl 1>/dev/null +#brew install curl perl 1>/dev/null +HOMEBREW_NO_AUTO_UPDATE=1 brew install curl perl 1>/dev/null diff --git a/doc/Changelog b/doc/Changelog index 94bd8747d..7076ec13d 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -3,6 +3,9 @@ when there is a difference. homebrew updates disabled, so it does not hang. removed trailing slashes from configure paths. Moved iOS tests to allow-failure. + - travis, analyzer disabled on test without debug, that does not + run anway. Turn off failing tests except one. Update iOS test + to xcode image 12.2. 22 March 2021: George - Fix unused-function warning when compiling with --enable-dnscrypt. -- 2.47.2