diff options
| -rw-r--r-- | coin_build_instructions.py | 4 | ||||
| -rw-r--r-- | coin_test_instructions.py | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index c48f5e3b2..df70d52ee 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -132,7 +132,9 @@ def run_build_instructions(): exit() # Uses default python, hopefully we have python2 installed on all hosts - call_setup("") + # Skip building using Python 2 on Windows, because of different MSVC C runtimes (VS2008 vs VS2015+) + if CI_HOST_OS != "Windows": + call_setup("") # In case of packaging build, we have to build also python3 wheel if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]: diff --git a/coin_test_instructions.py b/coin_test_instructions.py index c9c184dd0..ffbf001fa 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -81,10 +81,14 @@ def run_test_instructions(): exit() os.chdir(CI_ENV_AGENT_DIR) - call_testrunner("", "0") + testRun = 0 + # We didn't build for Python 2 in win + if CI_HOST_OS != "Windows": + call_testrunner("", str(testRun)) + testRun =+ 1 # We know that second build was with python3 if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]: - call_testrunner("3", "1") + call_testrunner("3", str(testRun)) if __name__ == "__main__": run_test_instructions() |