diff options
| author | Simo Fält <simo.falt@qt.io> | 2024-04-02 19:30:05 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2024-04-02 20:18:53 +0300 |
| commit | 3913b5abb2ff8aa40dd76796281d4961ce9e1938 (patch) | |
| tree | 27574acba5f25fe5b78cf02dddeb35c9c37b2e2f | |
| parent | 66a58efd807e3b168915699289d3e98f4305441a (diff) | |
Revert "CI: Remove keyring disabling"
This reverts commit 5a3d464bed72a5647eb7c1ff6f850838a0356cc2.
The provisioning fix is not in qt5#6.7.0.
Change-Id: I949dc6d05100a541fb0814e1a6101b712be619a6
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
| -rw-r--r-- | coin/instructions/common_environment.yaml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 441a01803..a422899e0 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -204,6 +204,21 @@ instructions: property: host.os equals_value: MacOS - type: ExecuteCommand + command: "keyring --disable" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: host.arch + equals_value: AARCH64 + userMessageOnFailure: > + Failed to disable keyring + - type: ExecuteCommand command: "sudo apt-get install python3-pip libclang-11-dev clang -y" maxTimeInSeconds: 14400 maxTimeBetweenOutput: 1200 |