diff options
| author | Toni Saario <toni.saario@qt.io> | 2021-05-11 09:18:23 +0300 |
|---|---|---|
| committer | Toni Saario <toni.saario@qt.io> | 2021-05-18 07:02:52 +0300 |
| commit | 0ed6fd77a0658414f2c8d104939e7de68477a80c (patch) | |
| tree | aaa66f6fa1b4fdc946bd849842854f8dcdfa58ce /coin | |
| parent | 9a94c4a415179377197f02580ea8fbcb0c5ce517 (diff) | |
Allow overriding CMake build timeout values
This allows modules to set custom timeouts for the builds.
Works by modules setting the CMAKE_BUILD_TIMEOUT and
CMAKE_BUILD_OUTPUT_TIMEOUT in the module's module_config.
Change-Id: I6f0170d77e9a962fb37e171d1c0d8c7b2277bb96
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/cmake_module_build_instructions.yaml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml index 05a3567e28..b53e6a8375 100644 --- a/coin/instructions/cmake_module_build_instructions.yaml +++ b/coin/instructions/cmake_module_build_instructions.yaml @@ -11,10 +11,24 @@ instructions: # The lack of space between the non qtbase configure args and the rest of the args is important! variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}" - !include "{{qt/qtbase}}/call_cmake.yaml" + - type: EnvironmentVariable + variableName: CMAKE_BUILD_TIMEOUT + variableValue: "6000" + enable_if: + condition: runtime + env_var: CMAKE_BUILD_TIMEOUT + equals_value: null + - type: EnvironmentVariable + variableName: CMAKE_BUILD_OUTPUT_TIMEOUT + variableValue: "1200" + enable_if: + condition: runtime + env_var: CMAKE_BUILD_OUTPUT_TIMEOUT + equals_value: null - type: ExecuteCommand command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 + maxTimeInSeconds: "{{.Env.CMAKE_BUILD_TIMEOUT}}" + maxTimeBetweenOutput: "{{.Env.CMAKE_BUILD_OUTPUT_TIMEOUT}}" userMessageOnFailure: > Failed to build sources. In the current state bug can be everywhere. - type: EnvironmentVariable |