From d94ef9c70c3c68db4ffdd6a142c12f8cf9ffc13b Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 1 Apr 2018 02:37:32 -0400 Subject: Re-enable OS X and iOS on Travis (GH #570, PR #627) --- .travis.yml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 52c587ea..16046605 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,9 +47,6 @@ matrix: - os: osx compiler: clang env: BUILD_MODE="ubsan" - # Travis infrastructure problems, Issue 570 - # Re-enable when OS X and iOS improves - - os: osx include: - os: linux @@ -84,21 +81,22 @@ matrix: env: - BUILD_MODE=android - PLATFORM=x86_64 - - # Travis infrastructure problems, Issue 570 - # Re-enable when OS X and iOS improves - #- os: osx - # env: - # - BUILD_MODE=ios - # - PLATFORM=iPhoneOS - #- os: osx - # env: - # - BUILD_MODE=ios - # - PLATFORM=WatchOS - #- os: osx - # env: - # - BUILD_MODE=ios - # - PLATFORM=AppleTVOS + - os: osx + env: + - BUILD_MODE=ios + - PLATFORM=iPhoneOS + - os: osx + env: + - BUILD_MODE=ios + - PLATFORM=WatchOS + - os: osx + env: + - BUILD_MODE=ios + - PLATFORM=AppleTVOS + - os: osx + env: + - BUILD_MODE=ios + - PLATFORM=iPhoneSimulator before_install: - | @@ -130,7 +128,7 @@ branches: - master addons: - sonarcloud: true + sonarcloud: false coverity_scan: project: -- cgit v1.2.1