aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2022-03-22 07:34:51 +0200
committerSimo Fält <simo.falt@qt.io>2022-03-22 10:43:28 +0000
commit6f20389eecdd3148b44ede8cd179d324ba79cb4f (patch)
tree22c86e9dacce8a5c2380ba1e9bfcc79bc166e07b /build_scripts
parentf7db5ff297c27c3c2058a937edd4546bd74bdf20 (diff)
Use python 3.8 when running CI integrations in Linux - take 2
Pick-to: 6.2 Change-Id: Ia78ca23984a08ff93dbf9c64ee96706478f8c93d Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts')
-rw-r--r--build_scripts/utils.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py
index 2daad642e..ea3679ffa 100644
--- a/build_scripts/utils.py
+++ b/build_scripts/utils.py
@@ -1187,7 +1187,11 @@ def get_qtci_virtualEnv(python_ver, host, hostArch, targetArch):
env_python = f"{_env}\\Scripts\\python.exe"
env_pip = f"{_env}\\Scripts\\pip.exe"
else:
- if python_ver == "3":
+ _pExe = f"python{python_ver}"
+ try:
+ run_instruction([_pExe, "--version"], f"Failed to guess python version {_pExe}")
+ except Exception as e:
+ print("Exception {type(e).__name__}: {e}")
_pExe = "python3"
return(_pExe, _env, env_pip, env_python)