feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

COIN: Make Debian/ARM possible for precheck

Browse Source 
Different compilers make a difference.
Let more parts of the build be configured by the architecture/platform
dependent environment.

Change-Id: I20d9c5b70ad66ee3e3262801728829f5b18eb735
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Eike Ziller
2024-09-27 14:56:05 +02:00
parent ccd2eb0e92
commit 1b54cfd527
3 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
coin/instructions/build.yaml
View File

@@ -17,14 +17,14 @@ instructions:
- type: ExecuteCommand
command: >-
curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}/build/qt_temp/elfutils-release_0.175qt-linux-x86_64.7z
https://master.qt.io/development_releases/prebuilt/elfutils/elfutils-release_0.175qt-linux-x86_64.7z
-o {{.AgentWorkingDir}}/build/qt_temp/elfutils.7z
{{.Env.QTC_ELFUTILS_URL}}
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download elfutils package, check logs."
- type: ExecuteCommand
command: >-
7z x -y {{.AgentWorkingDir}}/build/qt_temp/elfutils-release_0.175qt-linux-x86_64.7z
7z x -y {{.AgentWorkingDir}}/build/qt_temp/elfutils.7z
-o{{.AgentWorkingDir}}/build/qt_temp/elfutils
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
@@ -33,7 +33,7 @@ instructions:
command: >-
curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z
{{.Env.LLVM_BASE_URL}}-linux-Rhel8.8-gcc10.3-x86_64.7z
{{.Env.LLVM_BASE_URL}}{{.Env.QTC_LLVM_POSTFIX}}
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download LLVM package, check logs."
@@ -86,7 +86,7 @@ instructions:
command: >-
curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z
{{.Env.LLVM_BASE_URL}}-macos-universal.7z
{{.Env.LLVM_BASE_URL}}{{.Env.QTC_LLVM_POSTFIX}}
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download LLVM package, check logs."
@@ -140,15 +140,15 @@ instructions:
- type: ExecuteCommand
command: >-
curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}\build\qt_temp\elfutils-release_0.175qt-windows-x86_64.7z
https://master.qt.io/development_releases/prebuilt/elfutils/elfutils-release_0.175qt-windows-x86_64.7z
-o {{.AgentWorkingDir}}\build\qt_temp\elfutils.7z
{{.Env.QTC_ELFUTILS_URL}}
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download elfutils package, check logs."
- type: ExecuteCommand
command: >-
7z.exe x -y
{{.AgentWorkingDir}}\build\qt_temp\elfutils-release_0.175qt-windows-x86_64.7z
{{.AgentWorkingDir}}\build\qt_temp\elfutils.7z
-o{{.AgentWorkingDir}}\build\qt_temp\elfutils
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
@@ -221,7 +221,7 @@ instructions:
command: >-
curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}\build\qt_temp\libclang.7z
{{.Env.LLVM_BASE_URL}}-windows-vs2019_64.7z
{{.Env.LLVM_BASE_URL}}{{.Env.QTC_LLVM_POSTFIX}}
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download LLVM package, check logs."

55
coin/instructions/common_environment.yaml
View File

@@ -34,6 +34,12 @@ instructions:
- type: EnvironmentVariable
variableName: QTC_SDKTOOL_QT_EXT
variableValue: ".zip"
- type: EnvironmentVariable
variableName: QTC_ELFUTILS_URL
variableValue: "https://master.qt.io/development_releases/prebuilt/elfutils/elfutils-release_0.175qt-windows-x86_64.7z"
- type: EnvironmentVariable
variableName: QTC_LLVM_POSTFIX
variableValue: "-windows-vs2019_64.7z"
enable_if:
condition: property
property: target.os
@@ -46,10 +52,50 @@ instructions:
- type: EnvironmentVariable
variableName: QTC_SDKTOOL_QT_EXT
variableValue: ".tar.xz"
- type: EnvironmentVariable
variableName: QTC_ELFUTILS_URL
variableValue: "https://master.qt.io/development_releases/prebuilt/elfutils/elfutils-release_0.175qt-linux-x86_64.7z"
- type: EnvironmentVariable
variableName: QTC_LLVM_POSTFIX
variableValue: "-linux-Rhel8.8-gcc10.3-x86_64.7z"
- type: EnvironmentVariable
variableName: QTC_ICU_URL
variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z"
enable_if:
condition: property
property: target.os
equals_value: Linux
condition: and
conditions:
- condition: property
property: target.os
equals_value: Linux
- condition: property
property: target.arch
equals_value: X86_64
- type: Group
instructions:
- type: EnvironmentVariable
variableName: QTC_QT_POSTFIX
variableValue: "-Linux-Debian_11_6-GCC-Linux-Debian_11_6-AARCH64.7z"
- type: EnvironmentVariable
variableName: QTC_SDKTOOL_QT_EXT
variableValue: ".tar.xz"
- type: EnvironmentVariable
variableName: QTC_ELFUTILS_URL
variableValue: "https://master.qt.io/development_releases/prebuilt/elfutils/elfutils-release_0.175qt-linux-arm64.7z"
- type: EnvironmentVariable
variableName: QTC_LLVM_POSTFIX
variableValue: "-linux-Debian-11.6-gcc10.2-arm64.7z"
- type: EnvironmentVariable
variableName: QTC_ICU_URL
variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/icu/prebuilt/73.2/icu-linux-g++-Debian11.6-aarch64.7z"
enable_if:
condition: and
conditions:
- condition: property
property: target.os
equals_value: Linux
- condition: property
property: target.arch
equals_value: AARCH64
- type: Group
instructions:
- type: EnvironmentVariable
@@ -58,6 +104,9 @@ instructions:
- type: EnvironmentVariable
variableName: QTC_SDKTOOL_QT_EXT
variableValue: ".tar.xz"
- type: EnvironmentVariable
variableName: QTC_LLVM_POSTFIX
variableValue: "-macos-universal.7z"
enable_if:
condition: property
property: target.os

2
coin/instructions/provision.yaml
View File

@@ -52,7 +52,7 @@ instructions:
- type: ChangeDirectory
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 https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
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 {{.Env.QTC_ICU_URL}} {{.Env.QTC_QT_MODULES}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360