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 <samuli.piippo@qt.io>
This commit is contained in:
parent
99f22e3fc8
commit
e506c84eb2
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user