diff options
author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-01-09 22:02:33 +0100 |
---|---|---|
committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-01-10 15:15:21 +0000 |
commit | 09c9fbfbdf4aa2c6e84e080da32693b64719ca3c (patch) | |
tree | a49e6020c2170aea1536719aad775f3b89b86a66 /docker-compose.yml | |
parent | 4bdd40c12364b11e425ffb9904fd75d591dc7dfb (diff) | |
download | qbs-09c9fbfbdf4aa2c6e84e080da32693b64719ca3c.tar.gz |
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 <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker-compose.yml')
-rw-r--r-- | docker-compose.yml | 20 |
1 files changed, 20 insertions, 0 deletions
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 |