From 6d8d9e5dbc7c4af6db78d2db9129e7c5461fa323 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 18 Dec 2016 14:13:46 +0100 Subject: [PATCH 1/5] [macOS] Take Qt prefix path from Homebrew for CI resilience Recent CI failure was caused by path changed by Homebrew. --- CI/before_script.osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 00a948c65..6d62255aa 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -4,7 +4,7 @@ export CXX=clang++ export CC=clang DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps" -QT_PATH="/usr/local/opt/qt55" +QT_PATH=`brew --prefix qt@5.5` mkdir build cd build From 9b74adbb2c036cc2863dae19ba7a8fee8d42302b Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 30 Oct 2016 19:30:54 +0100 Subject: [PATCH 2/5] [macOS] Reenable CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f811ee0f..574fe1ba8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ os: - linux -# - osx + - osx osx_image: xcode7.2 language: cpp sudo: required From 525af97ffc838605d36a3ebbdb7ceba2da40fa76 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 18 Dec 2016 14:23:04 +0100 Subject: [PATCH 3/5] [macOS] Use newer Xcode version on CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 574fe1ba8..44db7b179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ os: - linux - osx -osx_image: xcode7.2 +osx_image: xcode7.3 language: cpp sudo: required dist: trusty From 37c8a36dd888cdab8a149ede0653a355efe27cff Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 18 Dec 2016 14:40:48 +0100 Subject: [PATCH 4/5] [macOS] Parametrize Qt5 version used on CI --- .travis.yml | 1 + CI/before_install.osx.sh | 2 +- CI/before_script.osx.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44db7b179..ad311ef0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ env: # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # via the "travis encrypt" command using the project repo's public key - secure: "jybGzAdUbqt9vWR/GEnRd96BgAi/7Zd1+2HK68j/i/8+/1YH2XxLOy4Jv/DUBhBlJIkxs/Xv8dRcUlFOclZDHX1d/9Qnsqd3oUVkD7k1y7cTOWy9TBQaE/v/kZo3LpzA3xPwwthrb0BvqIbOfIELi5fS5s8ba85WFRg3AX70wWE=" + - macos_qt_formula=qt@5.5 addons: apt: sources: diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 8a306186e..a2ea720e5 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -5,7 +5,7 @@ brew update brew rm cmake || true brew rm pkgconfig || true brew rm qt5 || true -brew install cmake pkgconfig qt55 +brew install cmake pkgconfig $macos_qt_formula curl http://downloads.openmw.org/osx/dependencies/openmw-deps-263d4a8.zip -o ~/openmw-deps.zip unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 6d62255aa..6955825a4 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -4,7 +4,7 @@ export CXX=clang++ export CC=clang DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps" -QT_PATH=`brew --prefix qt@5.5` +QT_PATH=`brew --prefix $macos_qt_formula` mkdir build cd build From 2967fbdf4c1f53e11ecb5d7281e1697625320568 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 18 Dec 2016 14:43:50 +0100 Subject: [PATCH 5/5] [CI] Fix email notification configuration --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad311ef0e..3e98b1f96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,9 +63,9 @@ script: - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi notifications: - recipients: - - corrmage+travis-ci@gmail.com email: + recipients: + - corrmage+travis-ci@gmail.com on_success: change on_failure: always irc: