diff options
| author | Simo Fält <simo.falt@qt.io> | 2022-03-21 18:47:28 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2022-03-22 00:02:29 +0200 |
| commit | 5f551ac558c65e2247dcba88c4aef0d6d0d28893 (patch) | |
| tree | 3ae558d4076336f27a195163870bf46ba126314d | |
| parent | f116ec1e59f7963fad1b44417c2b0e6392eaa60e (diff) | |
Use python 3.8 when running CI integrations in Linux
Pick-to: 6.2
Change-Id: Ib6740d32a8c9d984561181b3e626701ccaed43ab
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | coin_build_instructions.py | 3 | ||||
| -rw-r--r-- | coin_test_instructions.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index cb9aca39f..3b37d49af 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -181,6 +181,9 @@ if __name__ == "__main__": for env_var in ['CC', 'CXX']: if os.environ.get(env_var): del os.environ[env_var] + python_ver= "3" + if CI_TARGET_OS in["Linux"]: + python_ver = "3.8" if CI_TEST_PHASE in ["ALL", "BUILD"]: call_setup("3","BUILD") diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 898d4fd73..a7c559f64 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -123,6 +123,8 @@ def run_test_instructions(): call_testrunner("3.6.1", str(testRun)) call_testrunner("3.8.1", str(testRun)) call_testrunner("3.10.0", str(testRun)) + elif CI_HOST_OS == "Linux": + call_testrunner("3.8", str(testRun)) else: call_testrunner("3", str(testRun)) |