diff options
| author | Simo Fält <simo.falt@qt.io> | 2024-10-28 12:44:37 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2024-11-08 12:43:44 +0200 |
| commit | ea72d6a86a807f76954a4c42b65cc3b68d150663 (patch) | |
| tree | d74a77e7cff9293f0cf34764ee92af632034b454 /coin/instructions_utils.py | |
| parent | 1a3d1e8222c97aa6c216c7109742333a143c5854 (diff) | |
CI: Adapt to LoA config change from Debian to Ubuntu vm
Pick-to: 6.8
Change-Id: I6b9fce8b0c7b172534255e9c03e35c008cf74ca2
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin/instructions_utils.py')
| -rw-r--r-- | coin/instructions_utils.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/coin/instructions_utils.py b/coin/instructions_utils.py index fe2a5f957..f8ea5a593 100644 --- a/coin/instructions_utils.py +++ b/coin/instructions_utils.py @@ -143,10 +143,13 @@ def remove_variables(vars): def setup_virtualenv(python, exe, env, pip, log): - run_instruction( - [str(python), "-m", "pip", "install", "--user", "virtualenv==20.7.2"], - "Failed to pin virtualenv", - ) + # Within Ubuntu 24.04 one can't install anything with pip to outside of + # virtual env. Trust that we already have proper virtualenv installed. + if os.environ.get("HOST_OSVERSION_COIN") != "ubuntu_24_04": + run_instruction( + [str(python), "-m", "pip", "install", "--user", "virtualenv==20.7.2"], + "Failed to pin virtualenv", + ) # installing to user base might not be in PATH by default. env_path = Path(str(site.USER_BASE)) / "bin" v_env = env_path / "virtualenv" |