diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | docker-compose.yml | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 208ae94a2..ddf2f1449 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ git: env: global: - QT_INSTALL_DIR=~/Qt - - QT_VERSION=5.12.5 - - QTCREATOR_VERSION=4.10.1 + - QT_VERSION=5.12.6 + - QTCREATOR_VERSION=4.10.2 stages: - name: Build Qbs and and run autotests @@ -69,6 +69,10 @@ jobs: - qbs config defaultProfile qt - scripts/build-qbs-with-qbs.sh + - <<: *build-on-macos + name: With Qbs on macOS (xcode 11) + osx_image: xcode11 + - &build-on-windows stage: Build Qbs and and run autotests name: With Qbs on Windows (Visual Studio 2017) diff --git a/docker-compose.yml b/docker-compose.yml index f53d516c2..6770bebfd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,13 +12,13 @@ services: bionic: << : *linux hostname: bionic - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.14.0-1 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.6_1.14.1-0 build: dockerfile: docker/bionic/Dockerfile context: . args: - QT_VERSION: 5.12.5 - QTCREATOR_VERSION: 4.10.1 + QT_VERSION: 5.12.6 + QTCREATOR_VERSION: 4.10.2 stretch: << : *linux |