From c341d72a92ffb512de56a8867bc72ba9fe10b0e0 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 25 Jan 2018 19:23:53 +0100 Subject: [PATCH] Remove downloading CppUnit and CMake in Travis CI CppUnit has been replaced by Catch. The Precise build environment is not used, so no need to download CMake for it. --- build/tools/before_install.sh | 2 -- build/tools/travis-ci.sh | 6 ------ 2 files changed, 8 deletions(-) diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh index 444683b503..83a8fed7b3 100755 --- a/build/tools/before_install.sh +++ b/build/tools/before_install.sh @@ -19,7 +19,5 @@ case $(uname -s) in ;; Darwin) - brew update - brew install cppunit --universal ;; esac diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh index 228e6d653b..be740109bc 100755 --- a/build/tools/travis-ci.sh +++ b/build/tools/travis-ci.sh @@ -14,12 +14,6 @@ fi case $wxTOOLSET in cmake) - if [ `uname -s` = "Linux" ] && [ `lsb_release -cs` = "precise" ]; then - echo Updating CMake... - wget -O - https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz | tar xzf - - export PATH=`pwd`/cmake-3.6.2-Linux-x86_64/bin:$PATH - fi - if [ -z $wxCMAKE_TESTS ]; then wxCMAKE_TESTS=CONSOLE_ONLY; fi cmake --version echo 'travis_fold:start:configure'