From 224c962627383778ea448fb6ea2022aea5357079 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sat, 11 Jan 2020 23:25:15 +0100 Subject: travis: Add XCode 9.4 job This is still the default one on Travis and Qbs should support it Also, only build XCode10 variant on master to avoid extra job for gerrit builds Change-Id: I100e7e4560aeca3c2c3d77d81ecc9097853e0a2d Reviewed-by: Richard Weickelt Reviewed-by: Christian Kandeler --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 29d5f701c..e0e1f4dfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,9 +70,9 @@ jobs: - &build-on-macos stage: Build Qbs and and run autotests - name: With Qbs on macOS (xcode 10.3) + name: With Qbs on macOS (xcode 11.3) os: osx - osx_image: xcode10.3 + osx_image: xcode11.3 addons: homebrew: packages: @@ -100,8 +100,13 @@ jobs: - ccache -s - <<: *build-on-macos - name: With Qbs on macOS (xcode 11.3) - osx_image: xcode11.3 + name: With Qbs on macOS (xcode 10.3) + osx_image: xcode10.3 + if: branch = master + + - <<: *build-on-macos + name: With Qbs on macOS (xcode 9.4) + osx_image: xcode9.4 - &build-on-windows stage: Build Qbs and and run autotests -- cgit v1.2.3