Merge branch 'pipeline-openssl-error' into 'master'

OpenSSL path was incorrect

See merge request design-studio/cloud-services/design-viewer!4

CMakeLists.txt

@@ -56,8 +56,8 @@ if (ANDROID)
         set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS
         ${ANDROID_OPENSSL_PATH}/libcrypto_3.so
         ${ANDROID_OPENSSL_PATH}/libssl_3.so)
-        else()
-        message(WARNING "Cannot find OpenSSL for Android.")
+    else()
+        message(WARNING "Cannot find OpenSSL for Android. Path: ${ANDROID_OPENSSL_PATH}")
     endif()
 endif()
 

cicd/gitlab/stages/build.yml

@@ -24,13 +24,18 @@ build-android-multiarch:
     - if: $QDS_CI_QT_VERSION_ANDROID != "none"
   parallel:
     matrix:
-      - QDS_CI_JOB_TARGET_ARCH:
-        - "arm64_v8a"
-        - "armv7"
-        - "x86"
-        - "x86_64"
+      - QDS_CI_JOB_TARGET_ARCH: "arm64_v8a"
+        QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/arm64-v8a"
+      - QDS_CI_JOB_TARGET_ARCH: "armv7"
+        QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/armeabi-v7a"
+      - QDS_CI_JOB_TARGET_ARCH: "x86"
+        QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/x86"
+      - QDS_CI_JOB_TARGET_ARCH: "x86_64"
+        QDS_CI_JOB_OPENSSL_PATH: "/opt/openssl/ssl_3/x86_64"
   script:
     - cd qtquickdesigner-components
+    - ls -l /opt/openssl/ssl_3/
+    - ls -l ${QDS_CI_JOB_OPENSSL_PATH}
     - |
       cmake \
       -S . \
@@ -41,7 +46,7 @@ build-android-multiarch:
       -DANDROID_NDK_ROOT=/opt/android/ndk/25.2.9519653 \
       -DQT_HOST_PATH=${QT_PATH}/${QT_VERSION}/gcc_64 \
       -DCMAKE_INSTALL_PREFIX=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH} \
-      -DANDROID_OPENSSL_PATH=/opt/openssl/ssl_3/${QDS_CI_JOB_TARGET_ARCH}
+      -DANDROID_OPENSSL_PATH=${QDS_CI_JOB_OPENSSL_PATH}
     - cmake --build .
     - cmake --install .
     - cd ..
@@ -56,7 +61,7 @@ build-android-multiarch:
       -DANDROID_NDK_ROOT=/opt/android/ndk/25.2.9519653 \
       -DQT_HOST_PATH=${QT_PATH}/${QT_VERSION}/gcc_64 \
       -DCMAKE_INSTALL_PREFIX=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH} \
-      -DANDROID_OPENSSL_PATH=/opt/openssl/ssl_3/${QDS_CI_JOB_TARGET_ARCH}
+      -DANDROID_OPENSSL_PATH=${QDS_CI_JOB_OPENSSL_PATH}
     - cmake --build ${QDS_BUILD_PATH} --target all
     - cp -r ${QDS_BUILD_PATH}/android-build/build/outputs/apk/debug/* ${QDS_CI_JOB_ARTIFACTS_PATH}