From f74ab5b7dfe60565b84a7d060a8a21d245e3f5cb Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Wed, 24 Jan 2024 16:35:49 +0100
Subject: [PATCH] chore: multithreaded deployment is not working as expected
---
cicd/stages/build.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml
index 9c1b6ae..130dbff 100644
--- a/cicd/stages/build.yml
+++ b/cicd/stages/build.yml
@@ -8,7 +8,7 @@ build-wasm:
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "merge_request_event"
variables:
QDS_CI_BUILD_PATH: "${CI_PROJECT_DIR}/outdir/build"
- QDS_CI_JOB_TARGET_ARCH: "multithread"
+ QDS_CI_JOB_TARGET_ARCH: "singlethread"
artifacts:
name: design-viewer-${CI_JOB_ID}-qt${QDS_CI_QT_VERSION}
expose_as: "build-artifacts"
@@ -25,18 +25,18 @@ build-wasm:
./emsdk activate 3.1.37
source emsdk_env.sh
cd ..
- - echo ${DOCKER_ENV_QT_PATH_WASM_MULTITHREAD}
+ - echo ${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}
- echo ${DOCKER_ENV_QT_PATH_LINUX_GCC_64}
- |
cd qtquickdesigner-components
cmake \
-S . \
-G Ninja \
- -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_MULTITHREAD}/lib/cmake/Qt6/qt.toolchain.cmake \
+ -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}/lib/cmake/Qt6/qt.toolchain.cmake \
-DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
-DCMAKE_C_COMPILER=${EMSDK}/upstream/emscripten/emcc \
-DCMAKE_CXX_COMPILER=${EMSDK}/upstream/emscripten/em++ \
- -DCMAKE_INSTALL_PREFIX=${DOCKER_ENV_QT_PATH_WASM_MULTITHREAD}
+ -DCMAKE_INSTALL_PREFIX=${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}
- cmake --build .
- cmake --install .
- cd ..
@@ -46,7 +46,7 @@ build-wasm:
-B ${QDS_CI_BUILD_PATH} \
-G Ninja \
-DCMAKE_BUILD_TYPE=Debug \
- -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_MULTITHREAD}/lib/cmake/Qt6/qt.toolchain.cmake \
+ -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}/lib/cmake/Qt6/qt.toolchain.cmake \
-DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
-DCMAKE_C_COMPILER=${EMSDK}/upstream/emscripten/emcc \
-DCMAKE_CXX_COMPILER=${EMSDK}/upstream/emscripten/em++ \
--
GitLab