diff options
author | Simo Fält <simo.falt@qt.io> | 2023-09-18 11:46:09 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-21 16:16:46 +0000 |
commit | f07efb48194925fcf598a2f8ff46cafa8eec1284 (patch) | |
tree | 66bd122dbdd1c6e7efa8b8b07c5e85c7a343287b /coin | |
parent | ff6eca00875bcf455e8b79e539be22e49fa7f053 (diff) |
CI: Enable changing chroot in platform config for Debian packaging
Allows us to change the target distro through platform configuration
yaml file.
Pick-to: 6.6
Task-number: QTBUG-117120
Change-Id: Ie6e99e4b25198e27491e6191f57d77dbbe3c4eed
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 798175930e517e28230e3db3213510a22a041620)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/instructions/debian/prepare_debian_env.yaml | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/coin/instructions/debian/prepare_debian_env.yaml b/coin/instructions/debian/prepare_debian_env.yaml index b463db125c..fd130cebc7 100644 --- a/coin/instructions/debian/prepare_debian_env.yaml +++ b/coin/instructions/debian/prepare_debian_env.yaml @@ -8,16 +8,26 @@ instructions: variableName: COIN_SBUILD_CHROOT variableValue: "stable-arm64-sbuild" enable_if: - condition: property - property: target.arch - equals_value: AARCH64 + condition: and + conditions: + - condition: runtime + env_var: COIN_SBUILD_CHROOT + equals_value: null + - condition: property + property: target.arch + equals_value: AARCH64 - type: EnvironmentVariable variableName: COIN_SBUILD_CHROOT variableValue: "stable-amd64-sbuild" - disable_if: - condition: property - property: target.arch - equals_value: AARCH64 + enable_if: + condition: and + conditions: + - condition: runtime + env_var: COIN_SBUILD_CHROOT + equals_value: null + - condition: property + property: target.arch + equals_value: X86_64 - type: EnvironmentVariable variableName: COIN_SBUILD_DISTRO variableValue: "arm64-focal" |