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 <[email protected]>
Alegriabaile · Apr 5, 2022 · e506c84 · e506c84
1 parent 99f22e3
commit e506c84
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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"