diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2023-03-03 12:47:51 +0100 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2023-03-05 14:40:51 +0000 |
| commit | 3777fd78d220c8e8557d19d168b297da23c5cb51 (patch) | |
| tree | 59e8d4afbdbe554c82bd3f2bb8986874e7decfa5 /docker-compose.yml | |
| parent | 85d439c5adce0e2e9ea70beaf278ee2081a1342c (diff) | |
Add docker image focal-android-642 and workaround armv7 package
Add docker image focal-android-642 and corresponding github action.
Add workaround QTBUG-111713 to correct Qt 6.4.2 android armv7 package.
Change-Id: I8f7c5fd566237d4c490fb6014b0a4efbb6f04a53
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 680d1b837..059cbf7be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -120,6 +120,17 @@ services: QT_VERSION: 6.3.0 ANDROID_NDK_VERSION: 23.0.7599858 + focal-android-642: + << : *linux + hostname: focal-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.4.2-0 + build: + dockerfile: docker/focal/test-android.Dockerfile + context: . + args: + QT_VERSION: 6.4.2 + ANDROID_NDK_VERSION: 23.0.7599858 + focal-android-ndk-r19c: << : *linux hostname: focal-android |