From 1b5cfe1d428400aa74dd6ce5134a5cb79474fcb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Han=C3=A7erli?= <burak.hancerli@qt.io>
Date: Wed, 3 Apr 2024 14:21:09 +0000
Subject: [PATCH] QDS-12191 Update to Qt 6.7.0
---
cicd/gitlab-ci.yml | 2 +-
cicd/stages/build.yml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cicd/gitlab-ci.yml b/cicd/gitlab-ci.yml
index 33bccd4..8dd8ae4 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 79c476e..4dd6505 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}
--
GitLab