forked from qt-creator/qt-creator
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>
This commit is contained in:
4
.github/workflows/build_cmake.yml
vendored
4
.github/workflows/build_cmake.yml
vendored
@@ -7,8 +7,8 @@ on:
|
|||||||
- 'doc/**'
|
- 'doc/**'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
QT_VERSION: 6.4.3
|
QT_VERSION: 6.5.0
|
||||||
MACOS_DEPLOYMENT_TARGET: 10.14
|
MACOS_DEPLOYMENT_TARGET: 10.15
|
||||||
CLANG_VERSION: 16.0.0
|
CLANG_VERSION: 16.0.0
|
||||||
ELFUTILS_VERSION: 0.175
|
ELFUTILS_VERSION: 0.175
|
||||||
CMAKE_VERSION: 3.21.1
|
CMAKE_VERSION: 3.21.1
|
||||||
|
@@ -66,6 +66,9 @@ instructions:
|
|||||||
userMessageOnFailure: "Failed to run build.py, check logs."
|
userMessageOnFailure: "Failed to run build.py, check logs."
|
||||||
- type: ChangeDirectory
|
- type: ChangeDirectory
|
||||||
directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools"
|
directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools"
|
||||||
|
- type: EnvironmentVariable
|
||||||
|
variableName: MACOSX_DEPLOYMENT_TARGET
|
||||||
|
variableValue: "{{.Env.SDKTOOL_MACOSX_DEPLOYMENT_TARGET}}"
|
||||||
- type: ExecuteCommand
|
- 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"
|
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
|
maxTimeInSeconds: 36000
|
||||||
|
@@ -10,12 +10,15 @@ instructions:
|
|||||||
variableValue: http://master.qt.io/development_releases/prebuilt/libclang/libclang-release_16.0.0-based
|
variableValue: http://master.qt.io/development_releases/prebuilt/libclang/libclang-release_16.0.0-based
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_QT_BASE_URL
|
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
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_QT_MODULES
|
variableName: QTC_QT_MODULES
|
||||||
variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
|
variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: MACOSX_DEPLOYMENT_TARGET
|
variableName: MACOSX_DEPLOYMENT_TARGET
|
||||||
|
variableValue: 10.15
|
||||||
|
- type: EnvironmentVariable
|
||||||
|
variableName: SDKTOOL_MACOSX_DEPLOYMENT_TARGET
|
||||||
variableValue: 10.14
|
variableValue: 10.14
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_SDKTOOL_QT_BASE_URL
|
variableName: QTC_SDKTOOL_QT_BASE_URL
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
../../qt/tqtc-qt5.git:
|
../../qt/qt5.git:
|
||||||
ref: "tqtc/lts-6.2"
|
ref: "6.5"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user