From 09c9fbfbdf4aa2c6e84e080da32693b64719ca3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cotty?= Date: Thu, 9 Jan 2020 22:02:33 +0100 Subject: Add Docker environment to test Qbs with Qt for Android The Docker images contains ndk r20 and qt 5.13.2 as well as 5.14.0. Containers can be started with the following command line: - docker-compose pull bionic-android-513 - docker-compose run --rm bionic-android-513 The current folder is mounted under /qbs. Assuming that Qbs has been built in the current directory and with release configuration, the autotests can be invoked with: docker-compose run --rm bionic-android-513 scripts/test-qt-for-android.sh \ release/install-root/usr/local/bin A job Travis CI job is added which builds Qt and runs the Android blackbox tests. Change-Id: I76b1901cb7c41f8b5b0122265c99c9b37b59f261 Reviewed-by: Richard Weickelt Reviewed-by: Christian Kandeler --- docker-compose.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index e5c7329c2..6f7b9954b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,6 +23,26 @@ services: QT_VERSION: 5.12.6 QTCREATOR_VERSION: 4.10.2 + bionic-android-513: + << : *linux + hostname: bionic-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.13.2-0 + build: + dockerfile: docker/bionic/test-android.Dockerfile + context: . + args: + QT_VERSION: 5.13.2 + + bionic-android-514: + << : *linux + hostname: bionic-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.14.0-0 + build: + dockerfile: docker/bionic/test-android.Dockerfile + context: . + args: + QT_VERSION: 5.14.0 + stretch: << : *linux hostname: stretch -- cgit v1.2.3