diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-08-14 11:46:27 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-08-14 11:46:37 +0200 |
| commit | 2311a8224c3fc7141c44cc517f4ecdb882cd09f8 (patch) | |
| tree | 1d83aed514d564b8e0ccc9934772508926a51882 /.travis.yml | |
| parent | 0820c2d3ca6ac2e01c1d68945beeba45f4212658 (diff) | |
| parent | e42ad799703412d7375465df49282dd960f81e2e (diff) | |
Merge branch 1.17 into master
Change-Id: Ibdf2afb9f05682e0624540af22330abc8580bafb
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 4a4bd2573..2a438ee04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,7 +138,7 @@ jobs: - <<: *build-on-macos name: With Qbs on macOS (xcode 11.5) using iOS profile - if: branch = master + if: NOT branch =~ ^gerrit env: # Address sanitizer slows autotests down too much. # We would hit the maximum build time on Travis. @@ -163,17 +163,17 @@ jobs: - <<: *build-on-macos name: With Qbs on macOS (xcode 10.3) osx_image: xcode10.3 - if: branch = master + if: NOT branch =~ ^gerrit - <<: *build-on-macos name: With Qbs on macOS (xcode 9.4) osx_image: xcode9.4 - if: branch = master + if: NOT branch =~ ^gerrit - &build-on-windows-with-docker stage: Build Qbs and and run autotests name: With Qbs on Windows with Docker (Visual Studio 2017) - if: branch = master + if: NOT branch =~ ^gerrit os: windows services: docker env: @@ -233,7 +233,7 @@ jobs: - <<: *build-on-windows name: With Qbs on Windows (clang-cl) - if: branch = master + if: NOT branch =~ ^gerrit script: - qbs setup-toolchains --detect - qbs setup-qt ${QMAKE_PATH} qt |