diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-01-11 23:25:15 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-01-20 09:41:41 +0000 |
| commit | 224c962627383778ea448fb6ea2022aea5357079 (patch) | |
| tree | 01ce29c3aabf50073aa61b5d3e8257377dbd2746 | |
| parent | c347107e5c17703a74c44fa29200846d8cc1a50e (diff) | |
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 <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | examples/protobuf/cpp/addressbook.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/protobuf/import.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs | 1 |
5 files changed, 13 insertions, 4 deletions
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 diff --git a/examples/protobuf/cpp/addressbook.qbs b/examples/protobuf/cpp/addressbook.qbs index 35f8ee7fb..3f699c7db 100644 --- a/examples/protobuf/cpp/addressbook.qbs +++ b/examples/protobuf/cpp/addressbook.qbs @@ -7,6 +7,7 @@ CppApplication { Depends { name: "cpp" } cpp.cxxLanguageVersion: "c++11" + cpp.minimumMacosVersion: "10.8" cpp.warningLevel: "none" Depends { id: protobuf; name: "protobuf.cpp"; required: false } diff --git a/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs b/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs index a5a4caf75..bbe4c7484 100644 --- a/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs +++ b/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs @@ -7,6 +7,7 @@ CppApplication { Depends { name: "cpp" } cpp.cxxLanguageVersion: "c++11" + cpp.minimumMacosVersion: "10.8" Depends { name: "protobuf.cpp"; required: false } property bool hasProtobuf: { diff --git a/tests/auto/blackbox/testdata/protobuf/import.qbs b/tests/auto/blackbox/testdata/protobuf/import.qbs index 4c4de063f..c51fd8f93 100644 --- a/tests/auto/blackbox/testdata/protobuf/import.qbs +++ b/tests/auto/blackbox/testdata/protobuf/import.qbs @@ -8,6 +8,7 @@ CppApplication { protobuf.cpp.importPaths: [sourceDirectory] cpp.cxxLanguageVersion: "c++11" + cpp.minimumMacosVersion: "10.8" Depends { name: "protobuf.cpp"; required: false } property bool hasProtobuf: { diff --git a/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs b/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs index 788bbc93c..2dfcbea5f 100644 --- a/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs +++ b/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs @@ -9,6 +9,7 @@ CppApplication { protobuf.cpp.importPaths: (theImportDir ? [theImportDir] : []).concat([sourceDirectory]) cpp.cxxLanguageVersion: "c++11" + cpp.minimumMacosVersion: "10.8" Depends { name: "protobuf.cpp"; required: false } property bool hasProtobuf: { |