Add desktop build

cicd/stages/build.yml

@@ -7,12 +7,12 @@
     -S . \
     -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_TOOLCHAIN_FILE=${QDS_CI_JOB_QT_ANDROID_PATH}/lib/cmake/Qt6/qt.toolchain.cmake \
+    -DCMAKE_TOOLCHAIN_FILE=${QDS_CI_JOB_QT_PATH}/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} \
     -DFLOWVIEW_AUTO_QMLDIR=ON \
-    -DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_ANDROID_PATH}
+    -DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_PATH}
   - cmake --build .
   - cmake --install .
   - popd
@@ -32,11 +32,11 @@
     -B ${QDS_CI_JOB_BUILD_PATH} \
     -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_TOOLCHAIN_FILE=${QDS_CI_JOB_QT_ANDROID_PATH}/lib/cmake/Qt6/qt.toolchain.cmake \
+    -DCMAKE_TOOLCHAIN_FILE=${QDS_CI_JOB_QT_PATH}/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} \
-    -DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_ANDROID_PATH} \
+    -DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_PATH} \
     -DANDROID_OPENSSL_PATH=${QDS_CI_JOB_OPENSSL_PATH} \
     -DGOOGLE_PLAY_APP_VERSION=${GOOGLE_PLAY_APP_VERSION} \
     -DBUILD_EXAMPLES=OFF
@@ -74,7 +74,6 @@ build-android:
         QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/x86_64"
   variables:
     QDS_CI_JOB_BUILD_PATH: "${QDS_CI_CACHE_PATH}/${QDS_CI_JOB_TARGET_ARCH}/build"
-    QDS_CI_JOB_TARGET_PLATFORM: "android"
     QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_ARCH}
     QDS_CI_JOB_ARTIFACTS_PATH_APP: ${QDS_CI_JOB_ARTIFACTS_PATH}/app
     QDS_CI_JOB_ARTIFACTS_PATH_TEST: ${QDS_CI_JOB_ARTIFACTS_PATH}/test
@@ -86,8 +85,37 @@ build-android:
     expire_in: 1 week
   script:
     - mkdir -p ${QDS_CI_JOB_ARTIFACTS_PATH_APP} ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}
-    - export QDS_CI_JOB_QT_ANDROID_PATH="${DOCKER_ENV_QT_PATH_WITH_VERSION}/android_${QDS_CI_JOB_TARGET_ARCH}"
+    - export QDS_CI_JOB_QT_PATH="${DOCKER_ENV_QT_PATH_WITH_VERSION}/android_${QDS_CI_JOB_TARGET_ARCH}"
     - *build-components
     - *build-android-apps
     - *copy-and-sign-apks
     - *copy-and-sign-aab
+
+build-desktop:
+  extends: .pipeline_common
+  stage: build
+  variables:
+    QDS_CI_JOB_TARGET_ARCH: "gcc_64"
+    QDS_CI_JOB_BUILD_PATH: "${QDS_CI_CACHE_PATH}/${QDS_CI_JOB_TARGET_ARCH}/build"
+    QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_ARCH}
+  artifacts:
+    name: qt_ui_viewer-${CI_JOB_ID}-qt${QDS_CI_QT_VERSION}-${QDS_CI_JOB_TARGET_ARCH}
+    expose_as: "build-artifacts"
+    paths:
+      - ${QDS_CI_ARTIFACTS_PATH}
+    expire_in: 1 week
+  script:
+    - mkdir -p ${QDS_CI_JOB_ARTIFACTS_PATH}
+    - export QDS_CI_JOB_QT_PATH="${DOCKER_ENV_QT_PATH_WITH_VERSION}/${QDS_CI_JOB_TARGET_ARCH}"
+    - *build-components
+    - apt-get update
+    - apt-get install -y libpulse-dev
+    - |
+      cmake \
+      -S . \
+      -B ${QDS_CI_JOB_BUILD_PATH} \
+      -G Ninja \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_PREFIX_PATH=${QDS_CI_JOB_QT_PATH} \
+      -DBUILD_EXAMPLES=OFF
+    - cmake --build ${QDS_CI_JOB_BUILD_PATH}

cicd/stages/test.yml

@@ -8,6 +8,9 @@ test-x86_64:
     - job: build-android
       optional: false
       artifacts: true
+    - job: build-desktop
+      optional: false
+      artifacts: true
   variables:
     GIT_SUBMODULE_STRATEGY: none
     QDS_CI_JOB_TEST_RESULTS_PATH: ${CI_PROJECT_DIR}/test