diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2025-07-01 10:31:06 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-07-01 22:45:20 +0000 |
| commit | 63346ff5ffffe80789bb308a921cba9e5f55c2c3 (patch) | |
| tree | fd82b20e49d74f80f9a3e08312f55b2db1c10643 | |
| parent | 81e3704400d1579660cee8501ef462b9c5bef24b (diff) | |
Disable build on WoA 11 23h2
Note 'in_values' syntax seems not to work with strings
Task-number: QTQAINFRA-6973
Pick-to: 6.9
Change-Id: I1856316664a557a9a097217ea5cb649903580a1c
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit ae8e4964c50fe134c2d45c3c1f78944158e94806)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin.nodes | 1 | ||||
| -rw-r--r-- | coin/module_config.yaml | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/coin.nodes b/coin.nodes index e002b0c35..d577e4880 100644 --- a/coin.nodes +++ b/coin.nodes @@ -36,6 +36,7 @@ webassembly-linux-thread-asyncify OFF OFF windows-10_22h2-msvc2022 ON ON windows-10_22h2-mingw13 OFF ON windows-11_22h2-arm64-msvc2022 OFF ON +windows-11_23h2-arm64-msvc2022 OFF ON windows-11_23H2-llvm OFF ON windows-11_23H2-msvc2022-arm64 ON ON windows-11_23H2-msvc2022 ON ON diff --git a/coin/module_config.yaml b/coin/module_config.yaml index b812baa43..e892a2100 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -45,9 +45,14 @@ instructions: variableName: COMMON_NON_QTBASE_CMAKE_ARGS variableValue: " -DFEATURE_qtwebengine_build=OFF" enable_if: - condition: runtime - env_var: COIN_PLATFORM_ID - contains_value: "windows-11_22h2-arm64-msvc2022" + condition: or + conditions: + - condition: runtime + env_var: COIN_PLATFORM_ID + contains_value: "windows-11_22h2-arm64-msvc2022" + - condition: runtime + env_var: COIN_PLATFORM_ID + contains_value: "windows-11_23h2-arm64-msvc2022" - type: AppendToEnvironmentVariable variableName: COMMON_NON_QTBASE_TARGET_CMAKE_ARGS variableValue: " -DFEATURE_qtwebengine_build=OFF" |