diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 16:22:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-04-21 06:37:23 +0000 |
| commit | 44aaad4c2f31e8bb6cf673f18facb59584d3fa5f (patch) | |
| tree | 7fc0ffed1bc30dceeb31d6d767a2acbeec9648cd | |
| parent | 28c20b24aa633334b67ecb5402fc61e98d7b4c5b (diff) | |
| download | qt-creator-44aaad4c2f31e8bb6cf673f18facb59584d3fa5f.tar.gz | |
COIN/GitHub: Bump to Qt 6.5.0
Change-Id: I8c2122b7f35d049f0249631fc6e045b79dff9fbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | .github/workflows/build_cmake.yml | 4 | ||||
| -rw-r--r-- | coin/instructions/build.yaml | 3 | ||||
| -rw-r--r-- | coin/instructions/common_environment.yaml | 5 | ||||
| -rw-r--r-- | coin/product_dependencies.yaml | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 8a623779f1..17cb3ea370 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -7,8 +7,8 @@ on: - 'doc/**' env: - QT_VERSION: 6.4.3 - MACOS_DEPLOYMENT_TARGET: 10.14 + QT_VERSION: 6.5.0 + MACOS_DEPLOYMENT_TARGET: 10.15 CLANG_VERSION: 16.0.0 ELFUTILS_VERSION: 0.175 CMAKE_VERSION: 3.21.1 diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index 23461dbcf4..75818065a4 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -66,6 +66,9 @@ instructions: userMessageOnFailure: "Failed to run build.py, check logs." - type: ChangeDirectory directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools" + - type: EnvironmentVariable + variableName: MACOSX_DEPLOYMENT_TARGET + variableValue: "{{.Env.SDKTOOL_MACOSX_DEPLOYMENT_TARGET}}" - type: ExecuteCommand command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make" maxTimeInSeconds: 36000 diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index d3c072f0a9..b8be5f5c4a 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -10,12 +10,15 @@ instructions: variableValue: http://master.qt.io/development_releases/prebuilt/libclang/libclang-release_16.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.3-released/Qt" + variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-released/Qt" - type: EnvironmentVariable variableName: QTC_QT_MODULES variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine" - type: EnvironmentVariable variableName: MACOSX_DEPLOYMENT_TARGET + variableValue: 10.15 + - type: EnvironmentVariable + variableName: SDKTOOL_MACOSX_DEPLOYMENT_TARGET variableValue: 10.14 - type: EnvironmentVariable variableName: QTC_SDKTOOL_QT_BASE_URL diff --git a/coin/product_dependencies.yaml b/coin/product_dependencies.yaml index cbcc2bbf7e..4212b9b2e2 100644 --- a/coin/product_dependencies.yaml +++ b/coin/product_dependencies.yaml @@ -1,4 +1,4 @@ dependencies: - ../../qt/tqtc-qt5.git: - ref: "tqtc/lts-6.2" + ../../qt/qt5.git: + ref: "6.5" |