diff options
author | Eike Ziller <eike.ziller@qt.io> | 2023-05-12 14:42:17 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2023-05-12 14:42:24 +0200 |
commit | c06d291b11a152f5bc3bd117928561b912900e51 (patch) | |
tree | f1ddf0767b56826db13800b799875d4c3689f64c | |
parent | 62e9a0bec1a9811833c1194f287f30eaa7afec14 (diff) | |
parent | 8cd00ad279e5cb9e0c392b27c52631f9935e8e95 (diff) | |
download | qt-creator-c06d291b11a152f5bc3bd117928561b912900e51.tar.gz |
Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: I4264592dbf3a8bf105ad507cb4496777cd0e92b3
-rw-r--r-- | coin/instructions/build.yaml | 6 | ||||
-rw-r--r-- | coin/instructions/provision.yaml | 9 |
2 files changed, 4 insertions, 11 deletions
diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index 23461dbcf4..401db50562 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -31,7 +31,7 @@ instructions: maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to run build.py, check logs." - type: ChangeDirectory - directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools" + directory: "{{.AgentWorkingDir}}/build/tqtc-qtsdk/packaging_tools" - 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 @@ -65,7 +65,7 @@ instructions: maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to run build.py, check logs." - type: ChangeDirectory - directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools" + directory: "{{.AgentWorkingDir}}/build/tqtc-qtsdk/packaging_tools" - 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 @@ -114,7 +114,7 @@ instructions: maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to run build.py, check logs." - type: ChangeDirectory - directory: "{{.AgentWorkingDir}}\\build\\qtsdk\\packaging-tools" + directory: "{{.AgentWorkingDir}}\\build\\tqtc-qtsdk\\packaging_tools" - type: ExecuteCommand command: "python -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 nmake" maxTimeInSeconds: 36000 diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml index c11325d137..75fab04136 100644 --- a/coin/instructions/provision.yaml +++ b/coin/instructions/provision.yaml @@ -19,13 +19,6 @@ instructions: - type: InstallSourceArchive maxTimeInSeconds: 600 maxTimeBetweenOutput: 600 - project: qtsdk/qtsdk - ref: master - directory: "build/qtsdk" - userMessageOnFailure: "Failed to install qtsdk, check logs" - - type: InstallSourceArchive - maxTimeInSeconds: 600 - maxTimeBetweenOutput: 600 project: qtsdk/tqtc-qtsdk ref: master directory: "build/tqtc-qtsdk" @@ -57,7 +50,7 @@ instructions: property: host.os not_equals_value: Windows - type: ChangeDirectory - directory: "{{.BuildDir}}/qtsdk/packaging-tools" + directory: "{{.BuildDir}}/tqtc-qtsdk/packaging_tools" - type: ExecuteCommand command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z http://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}" executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution |