diff options
author | Richard Weickelt <richard@weickelt.de> | 2020-05-28 01:08:40 +0200 |
---|---|---|
committer | Richard Weickelt <richard@weickelt.de> | 2020-07-20 21:04:44 +0000 |
commit | 7401a6bc4e53d920fd7ced3249c735fd232d191c (patch) | |
tree | 0a95b1cd4a6944d578645707336383b0087f1f19 /docker-compose.yml | |
parent | 91ca67815af4512004d11a582753d4e6980e2004 (diff) | |
download | qbs-7401a6bc4e53d920fd7ced3249c735fd232d191c.tar.gz |
Switch to Qt 5.15.0 and drop CI support for MinGW on Linux
Cross-builds with MinGW on Linux are dropped mainly because of build
issues and because MinGW support bloats the resulting Docker image. We
have CI jobs running on Windows with MSVC and Clang-cl which should be
sufficient.
Change-Id: Iac4e0eaf1270844836697bebf52f9c056457caaf
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker-compose.yml')
-rw-r--r-- | docker-compose.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index b8b4528c9..2e87be195 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ x-default-service: &linux working_dir: /qbs environment: - BUILD_OPTIONS + - QTEST_FUNCTION_TIMEOUT volumes: - .:/qbs - ~/.ccache:/home/devel/.ccache @@ -15,12 +16,12 @@ services: bionic: << : *linux hostname: bionic - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.8_1.15.1-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.15.0_1.15.1-0 build: dockerfile: docker/bionic/Dockerfile context: . args: - QT_VERSION: 5.12.8 + QT_VERSION: 5.15.0 QTCREATOR_VERSION: 4.11.2 bionic-android-513: @@ -44,13 +45,13 @@ services: QT_VERSION: 5.14.0 windows: - image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.12.7_1.15.0-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.15.0_1.16.0-0 build: dockerfile: docker/windowsservercore/Dockerfile context: . args: - QT_VERSION: 5.12.7 - QBS_VERSION: 1.15.0 + QT_VERSION: 5.15.0 + QBS_VERSION: 1.16.0 working_dir: 'C:/qbs' environment: - BUILD_OPTIONS |