diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-01-26 14:05:13 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-01-28 12:18:44 +0000 |
| commit | eafd4a73ecdcfc1bc016af24e133de871c72dd53 (patch) | |
| tree | ec306db3668a220d00b13d3b7cd7535fd528a4ce /.travis.yml | |
| parent | ed05ce484dc18279bfa5ac7f0575ad93e9ecf9e2 (diff) | |
travis: Enable clang-cl build on master branch
Change-Id: Idc361a825c208020e2c87971383845ad95fab54e
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index bf3d209a4..d941d4cff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -126,11 +126,23 @@ jobs: - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QTCREATOR_VERSION} qtcreator - choco install python - pip install git+https://github.com/frerich/clcache.git@cae73d8255d78db8ba11e23c51fd2c9a89e7475b - script: + before_script: + - clcache -s + after_script: - clcache -s + script: - qbs setup-toolchains --detect - qbs setup-qt ${QMAKE_PATH} qt - qbs config qt.baseProfile MSVC2017-x64 - qbs config defaultProfile qt - scripts/build-qbs-with-qbs.sh - - clcache -s + + - <<: *build-on-windows + name: With Qbs on Windows (clang-cl) + if: branch = master + script: + - qbs setup-toolchains --detect + - qbs setup-qt ${QMAKE_PATH} qt + - qbs config profiles.qt.baseProfile clang-cl-x86_64 + - qbs config defaultProfile qt + - scripts/build-qbs-with-qbs.sh |