QDS-11726 Update to multithread

CMakeLists.txt

@@ -51,6 +51,7 @@ install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.html
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wasm
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.js
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.worker.js
     FILES ${CMAKE_CURRENT_BINARY_DIR}/qtloader.js
     DESTINATION ${CMAKE_INSTALL_PREFIX}
 )

cicd/stages/build.yml

@@ -8,11 +8,9 @@ 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: "singlethread"
-    QDS_CI_JOB_TARGET_PLATFORM: "wasm"
-    QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_PLATFORM}/${QDS_CI_JOB_TARGET_ARCH}
+    QDS_CI_JOB_TARGET_ARCH: "multithread"
   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}
     expose_as: "build-artifacts"
     paths:
       - ${QDS_CI_ARTIFACTS_PATH}
@@ -20,25 +18,25 @@ build-wasm:
       dotenv: build.env
   image: "git.qt.io:4567/design-studio/maintenance/docker-images/qt-full:${QDS_CI_QT_VERSION}"
   script:
-    - mkdir -p ${QDS_CI_JOB_ARTIFACTS_PATH}
+    - mkdir -p ${QDS_CI_ARTIFACTS_PATH}
     - |
       cd emsdk
       ./emsdk install 3.1.37
       ./emsdk activate 3.1.37
       source emsdk_env.sh
       cd ..
-    - echo ${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}
+    - echo ${DOCKER_ENV_QT_PATH_WASM_MULTITHREAD}
     - echo ${DOCKER_ENV_QT_PATH_LINUX_GCC_64}
     - |
       cd qtquickdesigner-components
       cmake \
       -S . \
       -G Ninja \
-      -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}/lib/cmake/Qt6/qt.toolchain.cmake \
+      -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_MULTITHREAD}/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_SINGLETHREAD}
+      -DCMAKE_INSTALL_PREFIX=${DOCKER_ENV_QT_PATH_WASM_MULTITHREAD}
     - cmake --build .
     - cmake --install .
     - cd ..
@@ -48,12 +46,11 @@ build-wasm:
       -B ${QDS_CI_BUILD_PATH} \
       -G Ninja \
       -DCMAKE_BUILD_TYPE=Debug \
-      -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}/lib/cmake/Qt6/qt.toolchain.cmake \
+      -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_MULTITHREAD}/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=${QDS_CI_JOB_ARTIFACTS_PATH}
+      -DCMAKE_INSTALL_PREFIX=${QDS_CI_ARTIFACTS_PATH}
     - cmake --build ${QDS_CI_BUILD_PATH}
     - cmake --install ${QDS_CI_BUILD_PATH}
     - echo "PREVIOUS_JOB_ID=${CI_JOB_ID}" >> build.env
-    - echo "JOB_TARGET_ARCH=${QDS_CI_JOB_TARGET_ARCH}" >> build.env

cicd/stages/release.yml

@@ -57,9 +57,6 @@ create-release:
         - name: "Binary Packages"
           url: "https://git.qt.io/design-studio/cloud-services/design-viewer-app/-/packages"
           link_type: "package"
-        - name: "Docker Images - Android"
-          url: "https://git.qt.io/design-studio/maintenance/docker-images/container_registry/143"
-          link_type: "image"
         - name: "Docker Images - WASM"
           url: "https://git.qt.io/design-studio/maintenance/docker-images/container_registry/142"
           link_type: "image"

cicd/stages/trigger.yml

@@ -4,7 +4,6 @@
     QDS_CI_PARENT_PIPELINE_ID: ${CI_PIPELINE_ID}
     QDS_CI_ARTIFACT_JOB_ID: ${PREVIOUS_JOB_ID}
     QDS_CI_PARENT_PROJECT_ID: ${CI_PROJECT_ID}
-    QDS_CI_PARENT_PIPELINE_ARCH: ${JOB_TARGET_ARCH}
   needs:
     - job: build-wasm
       artifacts: true