From e506c84eb214c95a1c1aab9a4043a39ef2087782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tommi=20M=C3=A4ntt=C3=A4ri?= Date: Tue, 5 Apr 2022 09:52:34 +0300 Subject: [PATCH] CI: use HOME directory for QNX license and PATH in Linux host builds To ensure that both Linux and Windows host builds are equivalent the Linux host builds need to use the common QNX SDP file that support both host environments. This new QNX SDP does not include QNX license files like previously, instead they are separately installed by the Ansible scripts of the CI system to the $HOME/.qnx directory. That directory is also supposed to be used for any possible binaries found via PATH environment variable. Task-number: QTBUG-101292 Pick-to: 6.3 6.2 Change-Id: I97ad71f00e8289e708c51565f86c6d0c84a9ae84 Reviewed-by: Samuli Piippo --- coin/instructions/prepare_building_env.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index d9855eff9a1..0f4788a8f58 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -335,10 +335,10 @@ instructions: variableValue: "{{.Env.QNX_710}}/target/qnx7" - type: EnvironmentVariable variableName: QNX_CONFIGURATION_EXCLUSIVE - variableValue: "{{.Env.QNX_710}}/.qnx" + variableValue: "{{.Env.HOME}}/.qnx" - type: EnvironmentVariable variableName: QNX_CONFIGURATION - variableValue: "{{.Env.QNX_710}}/.qnx" + variableValue: "{{.Env.HOME}}/.qnx" - type: PrependToEnvironmentVariable variableName: PATH variableValue: "{{.Env.QNX_710}}/host/linux/x86_64/usr/bin:" @@ -347,7 +347,7 @@ instructions: variableValue: "{{.Env.QNX_710}}/host/common/bin:" - type: PrependToEnvironmentVariable variableName: PATH - variableValue: "{{.Env.QNX_710}}/.qnx:" + variableValue: "{{.Env.HOME}}/.qnx:" - type: EnvironmentVariable variableName: QNX_HOST variableValue: "{{.Env.QNX_710}}/host/linux/x86_64"