diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-01-05 11:40:25 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-01-06 08:28:17 +0000 |
| commit | adc874f6902efd3cda953d21905e495119247104 (patch) | |
| tree | 49cac9abb7f0739f43b6c7093d14c2ab91504726 | |
| parent | ce1a547b6cbfd875d2996ee71b9aa8f7327262aa (diff) | |
COIN/GitHub: Use Qt 6.4.2
Change-Id: Ia66ce7e0a8ebf988c1af9888ddb7e9461f0cac05
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | .github/workflows/build_cmake.yml | 5 | ||||
| -rw-r--r-- | coin/instructions/common_environment.yaml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index d695061f95d..e430f35ebde 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -7,7 +7,8 @@ on: - 'doc/**' env: - QT_VERSION: 6.4.0 + QT_VERSION: 6.4.2 + MACOS_DEPLOYMENT_TARGET: 10.14 CLANG_VERSION: 15.0.0 ELFUTILS_VERSION: 0.175 CMAKE_VERSION: 3.21.1 @@ -489,7 +490,7 @@ jobs: run: | set(ENV{CC} ${{ matrix.config.cc }}) set(ENV{CXX} ${{ matrix.config.cxx }}) - set(ENV{MACOSX_DEPLOYMENT_TARGET} "10.13") + set(ENV{MACOSX_DEPLOYMENT_TARGET} "${{ env.MACOS_DEPLOYMENT_TARGET }}") if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x") execute_process( diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 5843ca790b0..33557ea11d5 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -10,7 +10,7 @@ instructions: variableValue: http://master.qt.io/development_releases/prebuilt/libclang/libclang-release_15.0.0-based - type: EnvironmentVariable variableName: QTC_QT_BASE_URL - variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.4/6.4.0-released/Qt" + variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.4/6.4.2-released/Qt" - type: EnvironmentVariable variableName: QTC_QT_MODULES variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine" |