From f07efb48194925fcf598a2f8ff46cafa8eec1284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 18 Sep 2023 11:46:09 +0300 Subject: [PATCH] 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 (cherry picked from commit 798175930e517e28230e3db3213510a22a041620) Reviewed-by: Qt Cherry-pick Bot --- .../debian/prepare_debian_env.yaml | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/coin/instructions/debian/prepare_debian_env.yaml b/coin/instructions/debian/prepare_debian_env.yaml index b463db125ca..fd130cebc72 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"