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

Qds 11337 Migrate to new Docker images

parent cca6f5b7
No related branches found
No related tags found
1 merge request!32Qds 11337 Migrate to new Docker images
Pipeline #66497 passed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    qtquickdesigner-components @ de28bdbd
    Compare 5736952b...de28bdbd
    Subproject commit 5736952b4b0c8aab4ae56b622ea9a53ae718b60a Subproject commit de28bdbdfb1a9393ca87febafb319125e5578d11
    cicd/gitlab-ci.yml
    + 4
    − 4
    View file @ f0568d1f
    variables: variables:
    QDS_CI_QT_VERSION: QDS_CI_QT_VERSION:
    value: "661" value: "6.6.1"
    options: options:
    - "643" - "6.4.3"
    - "652" - "6.5.2"
    - "661" - "6.6.1"
    description: "Qt version for build" description: "Qt version for build"
    QDS_CI_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/artifacts" QDS_CI_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/artifacts"
    DEBIAN_FRONTEND: non-interactive DEBIAN_FRONTEND: non-interactive
    ......
    cicd/stages/build.yml
    + 19
    − 21
    View file @ f0568d1f
    # QDS_CI_BUILD_QT_VERSION_ANDROID and QDS_CI_BUILD_QT_VERSION_WASM are the tags for the docker images. # QDS_CI_BUILD_QT_VERSION_ANDROID and QDS_CI_BUILD_QT_VERSION_WASM are the tags for the docker images.
    # https://git.qt.io/design-studio/maintenance/docker-images/container_registry # https://git.qt.io/design-studio/maintenance/docker-images/container_registry
    build-android-multiarch: build-android:
    stage: build stage: build
    tags: tags:
    - linux-blade - linux-blade
    ...@@ -17,47 +17,45 @@ build-android-multiarch: ...@@ -17,47 +17,45 @@ build-android-multiarch:
    - QDS_CI_JOB_TARGET_ARCH: "x86_64" - QDS_CI_JOB_TARGET_ARCH: "x86_64"
    QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/x86_64" QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/x86_64"
    variables: variables:
    QDS_BUILD_PATH: "${CI_PROJECT_DIR}/outdir/build" QDS_CI_JOB_BUILD_PATH: "${CI_PROJECT_DIR}/outdir/build"
    QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_PLATFORM}/${QDS_CI_JOB_TARGET_ARCH}
    QDS_CI_JOB_TARGET_PLATFORM: "android" QDS_CI_JOB_TARGET_PLATFORM: "android"
    image: "git.qt.io:4567/design-studio/maintenance/docker-images/${QDS_CI_JOB_TARGET_PLATFORM}:${QDS_CI_QT_VERSION}-${QDS_CI_JOB_TARGET_PLATFORM}-${QDS_CI_JOB_TARGET_ARCH}" QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_PLATFORM}/${QDS_CI_JOB_TARGET_ARCH}
    QDS_CI_JOB_QT_ANDROID_PATH: "${QDS_CI_QT_PATH}/${QDS_CI_QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}"
    image: "git.qt.io:4567/design-studio/maintenance/docker-images/qt-full:${QDS_CI_QT_VERSION}"
    artifacts: artifacts:
    name: design-viewer-${CI_JOB_ID}-qt${QDS_CI_QT_VERSION}-${QDS_CI_JOB_TARGET_PLATFORM}-${QDS_CI_JOB_TARGET_ARCH} name: design-viewer-${CI_JOB_ID}-qt${QDS_CI_QT_VERSION}-${QDS_CI_JOB_TARGET_PLATFORM}-${QDS_CI_JOB_TARGET_ARCH}
    expose_as: "build-artifacts" expose_as: "build-artifacts"
    paths: paths:
    - ${QDS_CI_ARTIFACTS_PATH} - ${QDS_CI_ARTIFACTS_PATH}
    rules:
    - if: $QDS_CI_QT_VERSION_ANDROID != "none"
    script: script:
    - mkdir -p ${QDS_CI_JOB_ARTIFACTS_PATH} - mkdir -p ${QDS_CI_JOB_ARTIFACTS_PATH}
    - ls -l /opt/openssl/ssl_3/
    - ls -l ${QDS_CI_JOB_OPENSSL_PATH} - ls -l ${QDS_CI_JOB_OPENSSL_PATH}
    - pushd 3rdparty/qtquickdesigner-components - pushd 3rdparty/qtquickdesigner-components
    - export
    - | - |
    cmake \ cmake \
    -S . \ -S . \
    -G Ninja \ -G Ninja \
    -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
    -DCMAKE_TOOLCHAIN_FILE=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}/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=/opt/android \ -DANDROID_SDK_ROOT=${DOCKER_ENV_ANDROID_SDK_ROOT} \
    -DANDROID_NDK_ROOT=/opt/android/ndk/25.2.9519653 \ -DANDROID_NDK_ROOT=${DOCKER_ENV_ANDROID_NDK_ROOT} \
    -DQT_HOST_PATH=${QT_PATH}/${QT_VERSION}/gcc_64 \ -DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
    -DCMAKE_INSTALL_PREFIX=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH} \ -DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_ANDROID_PATH}
    -DANDROID_OPENSSL_PATH=${QDS_CI_JOB_OPENSSL_PATH}
    - cmake --build . - cmake --build .
    - cmake --install . - cmake --install .
    - popd - popd
    - | - |
    cmake \ cmake \
    -S . \ -S . \
    -B ${QDS_BUILD_PATH} \ -B ${QDS_CI_JOB_BUILD_PATH} \
    -G Ninja \ -G Ninja \
    -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
    -DCMAKE_TOOLCHAIN_FILE=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}/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=/opt/android \ -DANDROID_SDK_ROOT=${DOCKER_ENV_ANDROID_SDK_ROOT} \
    -DANDROID_NDK_ROOT=/opt/android/ndk/25.2.9519653 \ -DANDROID_NDK_ROOT=${DOCKER_ENV_ANDROID_NDK_ROOT} \
    -DQT_HOST_PATH=${QT_PATH}/${QT_VERSION}/gcc_64 \ -DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
    -DCMAKE_INSTALL_PREFIX=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH} \ -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}
    - cmake --build ${QDS_BUILD_PATH} --target all - cmake --build ${QDS_CI_JOB_BUILD_PATH} --target all
    - cp -r ${QDS_BUILD_PATH}/android-build/build/outputs/apk/debug/* ${QDS_CI_JOB_ARTIFACTS_PATH} - cp -r ${QDS_CI_JOB_BUILD_PATH}/android-build/build/outputs/apk/debug/* ${QDS_CI_JOB_ARTIFACTS_PATH}
    cicd/stages/release.yml
    + 1
    − 1
    View file @ f0568d1f
    ...@@ -6,7 +6,7 @@ create-packages: ...@@ -6,7 +6,7 @@ create-packages:
    rules: rules:
    - if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
    needs: needs:
    - job: build-android-multiarch - job: build-android
    optional: false optional: false
    artifacts: true artifacts: true
    variables: variables:
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment