Skip to content
Snippets Groups Projects

QDS-14556 Extend tests

Merged Burak Hançerli requested to merge QDS-14556/extend-tests into master
Compare and
57 files
+ 1172
66
Compare changes
  • Side-by-side
  • Inline
Files
57
+ 9
16
@@ -17,9 +17,8 @@
- cmake --install .
- popd
.build-android-apps: &build-android-apps
.build-app: &build-android-apps
- export GOOGLE_PLAY_APP_VERSION=$(( $(git tag --list | wc -l) +11 ))
# where is this magic "$(git tag --list | wc -l) +11" coming from?
# "git tag --list | wc -l" counts the number of tags in the repository.
# The "+11" is a magic number which is the last GOOGLE_PLAY_APP_VERSION
# that was released before starting to add tags to the repository. After
@@ -39,6 +38,8 @@
-DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_PATH} \
-DANDROID_OPENSSL_PATH=${QDS_CI_JOB_OPENSSL_PATH} \
-DGOOGLE_PLAY_APP_VERSION=${GOOGLE_PLAY_APP_VERSION} \
-DQT_ANDROID_BUILD_ALL_ABIS=ON \
-QT_ANDROID_MULTI_ABI_FORWARD_VARS=GOOGLE_PLAY_APP_VERSION \
-DBUILD_EXAMPLES=OFF
- cat ${QDS_CI_JOB_BUILD_PATH}/src/dynamic_imports.qml
- cmake --build ${QDS_CI_JOB_BUILD_PATH} --target aab
@@ -64,18 +65,10 @@
build-android:
extends: .pipeline_common
stage: build
parallel:
matrix:
- QDS_CI_JOB_TARGET_ARCH: "arm64_v8a"
QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/arm64-v8a"
- QDS_CI_JOB_TARGET_ARCH: "armv7"
QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/armeabi-v7a"
- QDS_CI_JOB_TARGET_ARCH: "x86"
QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/x86"
- QDS_CI_JOB_TARGET_ARCH: "x86_64"
QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/x86_64"
variables:
QDS_CI_JOB_BUILD_PATH: "${QDS_CI_CACHE_PATH}/${QDS_CI_JOB_TARGET_ARCH}/build"
QDS_CI_JOB_TARGET_ARCH: "android_arm64_v8a"
QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/arm64-v8a"
QDS_CI_JOB_BUILD_PATH: "${CI_PROJECT_DIR}/${QDS_CI_JOB_TARGET_ARCH}/build"
QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_ARCH}
QDS_CI_JOB_ARTIFACTS_PATH_APP: ${QDS_CI_JOB_ARTIFACTS_PATH}/app
QDS_CI_JOB_ARTIFACTS_PATH_TEST: ${QDS_CI_JOB_ARTIFACTS_PATH}/test
@@ -87,9 +80,9 @@ build-android:
expire_in: 1 week
script:
- mkdir -p ${QDS_CI_JOB_ARTIFACTS_PATH_APP} ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}
- export QDS_CI_JOB_QT_PATH="${DOCKER_ENV_QT_PATH_WITH_VERSION}/android_${QDS_CI_JOB_TARGET_ARCH}"
- export QDS_CI_JOB_QT_PATH="${DOCKER_ENV_QT_PATH_WITH_VERSION}/${QDS_CI_JOB_TARGET_ARCH}"
- *build-components
- *build-android-apps
- *build-app
- *copy-and-sign-apks
- *copy-and-sign-aab
@@ -98,7 +91,7 @@ build-desktop:
stage: build
variables:
QDS_CI_JOB_TARGET_ARCH: "gcc_64"
QDS_CI_JOB_BUILD_PATH: "${QDS_CI_CACHE_PATH}/${QDS_CI_JOB_TARGET_ARCH}/build"
QDS_CI_JOB_BUILD_PATH: "${CI_PROJECT_DIR}/${QDS_CI_JOB_TARGET_ARCH}/build"
QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_ARCH}
artifacts:
name: qt_ui_viewer-${CI_JOB_ID}-qt${QDS_CI_QT_VERSION}-${QDS_CI_JOB_TARGET_ARCH}
Loading