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 | |
| parent | 85d439c5adce0e2e9ea70beaf278ee2081a1342c (diff) | |
| download | qbs-3777fd78d220c8e8557d19d168b297da23c5cb51.tar.gz | |
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>
| -rw-r--r-- | .github/workflows/main.yml | 6 | ||||
| -rw-r--r-- | docker-compose.yml | 11 | ||||
| -rwxr-xr-x | scripts/install-qt.sh | 8 |
3 files changed, 24 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7adf33c80..a297e8ac0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -380,6 +380,12 @@ jobs: script: './scripts/test-qt-for-android.sh', } - { + name: 'Run Android tests (Qt 6.4.2)', + image: 'focal-android-642', + profile: '', + script: './scripts/test-qt-for-android.sh', + } + - { name: 'Run Android tests (ndk r19c)', image: 'focal-android-ndk-r19c', profile: '', 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 diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 4ccad3f8e..717bab6af 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -356,11 +356,17 @@ for COMPONENT in ${COMPONENTS}; do if [ "${TARGET_PLATFORM}" == "android" ] && [ ! "${VERSION}" \< "6.0.0" ]; then CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/target_qt.conf" + ANDROID_QMAKE_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qmake" + if [[ "${VERSION}" == "6.4.2" ]] && [[ "${TOOLCHAIN}" == "android_armv7" ]]; then + sed -i "s/\r//" "${CONF_FILE}" + sed -i "s|HostLibraryExecutables=.\/bin|HostLibraryExecutables=.\/libexec|g" "${CONF_FILE}" + chmod +x "${ANDROID_QMAKE_FILE}" + fi sed -i "s|target|../$TOOLCHAIN|g" "${CONF_FILE}" sed -i "/HostPrefix/ s|$|gcc_64|g" "${CONF_FILE}" - ANDROID_QMAKE_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qmake" QMAKE_FILE="${UNPACK_DIR}/${VERSION}/gcc_64/bin/qmake" sed -i "s|\/home\/qt\/work\/install\/bin\/qmake|$QMAKE_FILE|g" "${ANDROID_QMAKE_FILE}" + sed -i "s|\/Users\/qt\/work\/install\/bin\/qmake|$QMAKE_FILE|g" "${ANDROID_QMAKE_FILE}" else CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qt.conf" echo "[Paths]" > ${CONF_FILE} |