Skip to content
Snippets Groups Projects
Unverified Commit 943571dd authored by Burak Hançerli's avatar Burak Hançerli :headphones:
Browse files

fix: trying to use env variables from docker image

parent f3c0d9b3
No related branches found
No related tags found
1 merge request!32Qds 11337 Migrate to new Docker images
Pipeline #66491 passed
......@@ -9,7 +9,6 @@ variables:
QDS_CI_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/artifacts"
DEBIAN_FRONTEND: non-interactive
GIT_SUBMODULE_STRATEGY: recursive
QDS_CI_QT_PATH: "${DOCKER_ENV_QT_PATH}"
workflow:
name: 'Qt-${QDS_CI_QT_VERSION} - ${CI_COMMIT_MESSAGE}'
......
......@@ -32,15 +32,12 @@ build-android:
- ls -l ${QDS_CI_JOB_OPENSSL_PATH}
- pushd 3rdparty/qtquickdesigner-components
- export
- echo "QDS_CI_QT_PATH = ${QDS_CI_QT_PATH}"
- echo "QDS_CI_JOB_QT_ANDROID_PATH = ${QDS_CI_JOB_QT_ANDROID_PATH}"
- echo "DOCKER_ENV_QT_PATH_LINUX_GCC_64 = ${DOCKER_ENV_QT_PATH_LINUX_GCC_64}"
- |
cmake \
-S . \
-G Ninja \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_TOOLCHAIN_FILE=${QDS_CI_JOB_QT_ANDROID_PATH}/lib/cmake/Qt6/qt.toolchain.cmake \
-DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WITH_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}/lib/cmake/Qt6/qt.toolchain.cmake \
-DANDROID_SDK_ROOT=${DOCKER_ENV_ANDROID_SDK_ROOT} \
-DANDROID_NDK_ROOT=${DOCKER_ENV_ANDROID_NDK_ROOT} \
-DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
......@@ -54,7 +51,7 @@ build-android:
-B ${QDS_CI_JOB_BUILD_PATH} \
-G Ninja \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_TOOLCHAIN_FILE=${QDS_CI_JOB_QT_ANDROID_PATH}/lib/cmake/Qt6/qt.toolchain.cmake \
-DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WITH_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}/lib/cmake/Qt6/qt.toolchain.cmake \
-DANDROID_SDK_ROOT=${DOCKER_ENV_ANDROID_SDK_ROOT} \
-DANDROID_NDK_ROOT=${DOCKER_ENV_ANDROID_NDK_ROOT} \
-DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment