diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index e0986c881a8..d0c9124fb00 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -7,7 +7,7 @@ on: - 'doc/**' env: - QT_VERSION: 6.6.2 + QT_VERSION: 6.7.1 MACOS_DEPLOYMENT_TARGET: 11.0 CLANG_VERSION: 18.1.5 ELFUTILS_VERSION: 0.175 @@ -200,7 +200,7 @@ jobs: endif() elseif ("${{ runner.os }}" STREQUAL "Linux") set(url_os "linux_x64") - set(qt_package_arch_suffix "gcc_64") + set(qt_package_arch_suffix "linux_gcc_64") set(qt_dir_prefix "${qt_version}/gcc_64") set(qt_package_suffix "-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64") elseif ("${{ runner.os }}" STREQUAL "macOS") @@ -267,10 +267,10 @@ jobs: ) endforeach() - # uic depends on libicu56.so + # uic, qmake depend on libicu*.so libraries if ("${{ runner.os }}" STREQUAL "Linux") downloadAndExtract( - "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel7.2-x64.7z" + "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel8.6-x86_64.7z" icu.7z ) endif() diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index c240a3bd15a..e4453c9e71b 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -142,38 +142,6 @@ instructions: property: target.arch equals_value: X86_64 - - type: Group - instructions: - - type: MakeDirectory - directory: "{{.AgentWorkingDir}}/build/qt_temp" - maxTimeInSeconds: 3600 - maxTimeBetweenOutput: 360 - userMessageOnFailure: "Failed to create folder qt_temp, check logs." - - type: ExecuteCommand - command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x86.7z https://master.qt.io/development_releases/prebuilt/python/Python38-win-x86.7z" - maxTimeInSeconds: 3600 - maxTimeBetweenOutput: 360 - userMessageOnFailure: "Failed to download python package, check logs." - - type: ExecuteCommand - command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x86.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python" - maxTimeInSeconds: 3600 - maxTimeBetweenOutput: 360 - userMessageOnFailure: "Failed to extract python package, check logs." - - type: ExecuteCommand - command: "python -u {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\scripts\\build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator --build {{.AgentWorkingDir}}\\qt-creator\\qt-creator_build --python-path {{.AgentWorkingDir}}\\buid\\qt_temp\\python --no-qtcreator --no-zip" - maxTimeInSeconds: 36000 - maxTimeBetweenOutput: 3600 - userMessageOnFailure: "Failed to run build.py, check logs." - enable_if: - condition: and - conditions: - - condition: property - property: target.compiler - in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019] - - condition: property - property: target.arch - equals_value: X86 - - type: UploadArtifact archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build" transferType: UploadModuleBuildArtifact diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 7a648a0b87c..1410fa79e7e 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -10,7 +10,7 @@ instructions: variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_18.1.5-based - type: EnvironmentVariable variableName: QTC_QT_BASE_URL - variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.2-released/Qt" + variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.7/6.7.1-released/Qt" - type: EnvironmentVariable variableName: QTC_QT_MODULES variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine" diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 96428853f26..ecef22e379c 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -16,6 +16,9 @@ accept_configuration: - condition: property property: target.compiler equals_value: MSVC2019 + - condition: property + property: target.arch + not_equals_value: X86 - condition: and conditions: - condition: property diff --git a/coin/product_dependencies.yaml b/coin/product_dependencies.yaml index a658f8103be..9a7e164d2b3 100644 --- a/coin/product_dependencies.yaml +++ b/coin/product_dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../../qt/qt5.git: - ref: "6.6" + ref: "6.7"