diff options
| author | Tommi Mänttäri <tommi.manttari@qt.io> | 2022-04-05 09:52:34 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-05 19:58:00 +0000 |
| commit | 2c0cd65fbaef5da5b5b82e684e2946b68ee2a3a9 (patch) | |
| tree | e87fa01d12c12950bec44b80a643505e7b3ea9e5 /coin | |
| parent | c6bdf14cd1112761bc2039f7e7b0186700f6b82c (diff) | |
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
Change-Id: I97ad71f00e8289e708c51565f86c6d0c84a9ae84
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit e506c84eb214c95a1c1aab9a4043a39ef2087782)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/prepare_building_env.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index dfaa9f496a..60399b46b1 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -346,10 +346,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:" @@ -358,7 +358,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" |