aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorRichard Weickelt <richard@weickelt.de>2019-05-23 21:24:20 +0200
committerRichard Weickelt <richard@weickelt.de>2019-08-27 04:41:42 +0000
commit52f4eccf83d8c0f4519216fede7e8311fd275f70 (patch)
tree754bc40a68118ac6a6e9d68fa31026fa54b7ff2a /.travis.yml
parentc6e49568deaf973df276d5168714df0c9a2aad85 (diff)
Add Ubuntu 18.04 Docker image
Contains: - Qbs 1.13.1 (from QtCreator 4.9.2) - Qt 5.12.4 for Linux (prebuilt) - Qt 5.12.4 for Windows (compiled from source) - gcc 7.4 - mingw-w64 (7.3) This image can build Qbs and all its components for Linux and Windows targets. It might supersede Debian stretch which is not officially supported by Qt 5.12. The only limitation is that it can neither build Chocolatey packages nor run windeployqt. Change-Id: Icee1f002483f68839d39c8c152a9c5d886dabcfb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml15
1 files changed, 10 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 54455ff45..89d968b83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,11 @@ stages:
jobs:
include:
- - &build-on-stretch
+ - &build-on-bionic
stage: Build Qbs and and run autotests
- name: With Qbs on Debian stretch (linux_amd64)
+ name: With Qbs on Ubuntu bionic (linux_gcc64)
env:
- SERVICE=stretch
+ SERVICE=bionic
services:
- docker
before_install:
@@ -29,11 +29,16 @@ jobs:
script:
- docker-compose run --rm ${SERVICE} scripts/build-qbs-with-qbs.sh
- - <<: *build-on-stretch
- name: With QMake on Debian stretch (linux_amd64)
+ - <<: *build-on-bionic
+ name: With QMake on Ubuntu bionic (linux_gcc64)
script:
- docker-compose run --rm ${SERVICE} scripts/build-qbs-with-qmake.sh
+ - <<: *build-on-bionic
+ name: With Qbs on Ubuntu bionic (mingw32_w64)
+ script:
+ - docker-compose run --rm ${SERVICE} qbs build profile:qt-mingw32_w64
+
- &build-on-macos
stage: Build Qbs and and run autotests
name: With Qbs on macOS (xcode 10.2)