aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2023-03-16 11:51:30 +0200
committerSimo Fält <simo.falt@qt.io>2023-03-16 16:25:02 +0200
commitb2bd0b0795f41ef6eae8be12d3c5b42aff96e1ec (patch)
tree2cee61bf900ee3f4824b234761991f86e2d1a353
parent558adfebf001bce0da4b972626fd8a889dd7e757 (diff)
COIN: Install requirements.txt to virtualenv also in arm mac
Change-Id: I5d1a24f17c39ff9dd934d6dbc98f18e135d803c7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
-rw-r--r--coin_test_instructions.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index d89e47374..dcc050941 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -38,10 +38,11 @@ def call_testrunner(python_ver, buildnro):
if sys.platform == "win32":
python3 = os.path.join(os.getenv("PYTHON3_PATH"), "python.exe")
- # we shouldn't install anything to m1, while it is not virtualized
+ # we shouldn't install anything outside of virtualenv, while m1 is not virtualized yet
if CI_HOST_OS == "MacOS" and CI_HOST_ARCH == "ARM64":
v_env = "virtualenv"
run_instruction([str(v_env), "-p", str(_pExe), str(_env)], "Failed to create virtualenv")
+ run_instruction([env_pip, "install", "-r", "requirements.txt"], "Failed to install dependencies")
else:
run_instruction([python3, "-m", "pip", "install", "--user", "virtualenv==20.7.2"], "Failed to pin virtualenv")
# installing to user base might not be in PATH by default.