Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Qt UI Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Design Studio
QML Viewer Projects
Qt UI Viewer
Commits
943571dd
Unverified
Commit
943571dd
authored
1 year ago
by
Burak Hançerli
Browse files
Options
Downloads
Patches
Plain Diff
fix: trying to use env variables from docker image
parent
f3c0d9b3
No related branches found
No related tags found
1 merge request
!32
Qds 11337 Migrate to new Docker images
Pipeline
#66491
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cicd/gitlab-ci.yml
+0
-1
0 additions, 1 deletion
cicd/gitlab-ci.yml
cicd/stages/build.yml
+2
-5
2 additions, 5 deletions
cicd/stages/build.yml
with
2 additions
and
6 deletions
cicd/gitlab-ci.yml
+
0
−
1
View file @
943571dd
...
...
@@ -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}'
...
...
This diff is collapsed.
Click to expand it.
cicd/stages/build.yml
+
2
−
5
View file @
943571dd
...
...
@@ -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_PAT
H}/lib/cmake/Qt6/qt.toolchain.cmake \
-DCMAKE_TOOLCHAIN_FILE=${
DOCKER_ENV_QT_PATH_WITH_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARC
H}/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_PAT
H}/lib/cmake/Qt6/qt.toolchain.cmake \
-DCMAKE_TOOLCHAIN_FILE=${
DOCKER_ENV_QT_PATH_WITH_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARC
H}/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} \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment