diff --git a/cicd/gitlab-ci.yml b/cicd/gitlab-ci.yml index 33bccd4606ffd5314aa0f5311d698cd7c3bc848c..8dd8ae478010e2b7cffbda83defed21d4659c81c 100644 --- a/cicd/gitlab-ci.yml +++ b/cicd/gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - QDS_CI_QT_VERSION: "6.6.1" + QDS_CI_QT_VERSION: "6.7.0" QDS_CI_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/artifacts" DEBIAN_FRONTEND: non-interactive GIT_SUBMODULE_STRATEGY: recursive diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml index 79c476e6d76a01f0fc6c4181580d9c95f18c09de..4dd650528abbf8eaccb9a4dd1a9cfafdcea918f7 100644 --- a/cicd/stages/build.yml +++ b/cicd/stages/build.yml @@ -56,7 +56,8 @@ build-android: -DANDROID_NDK_ROOT=${DOCKER_ENV_ANDROID_NDK_ROOT} \ -DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \ -DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_ANDROID_PATH} \ - -DANDROID_OPENSSL_PATH=${QDS_CI_JOB_OPENSSL_PATH} + -DANDROID_OPENSSL_PATH=${QDS_CI_JOB_OPENSSL_PATH} \ + -DBUILD_EXAMPLES=OFF - cmake --build ${QDS_CI_JOB_BUILD_PATH} --target all - cp -r ${QDS_CI_JOB_BUILD_PATH}/src/android-build/build/outputs/apk/release/* ${QDS_CI_JOB_ARTIFACTS_PATH_APP} - cp -r ${QDS_CI_JOB_BUILD_PATH}/tests/android-build/build/outputs/apk/release/* ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}