diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-10-13 16:27:27 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-10-26 14:02:21 +0000 |
| commit | 73319dffde4c02df78b42fa2c91a965621de8f3f (patch) | |
| tree | 821d6b479d0e12cba22c971b2f77ce1e59da0b0c | |
| parent | ceae7f16e5a52fc553f508d616931ee438f3b4e8 (diff) | |
Add Android Docker image containing Qt 5.15
Add also a job for github actions.
Change-Id: Ibf4b1740379605f32ead66657bc4b81529089cc9
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | .github/workflows/main.yml | 6 | ||||
| -rw-r--r-- | docker-compose.yml | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54fa31932..5ad413bd4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -249,6 +249,12 @@ jobs: profile: '', script: './scripts/test-qt-for-android.sh', } + - { + name: 'Run Android tests (Qt 5.15)', + image: 'focal-android-515', + profile: '', + script: './scripts/test-qt-for-android.sh', + } env: QBS_TEST_SOURCE_ROOT: 'tests' QBS_AUTOTEST_PROFILE: ${{ matrix.config.profile }} diff --git a/docker-compose.yml b/docker-compose.yml index d69776c67..4e8112bf9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,6 +48,16 @@ services: args: QT_VERSION: 5.14.0 + focal-android-515: + << : *linux + hostname: focal-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.15.1-0 + build: + dockerfile: docker/focal/test-android.Dockerfile + context: . + args: + QT_VERSION: 5.15.1 + focal-baremetal: << : *linux hostname: focal-baremetal |