diff --git a/scripts/env/sofa-ci-windows10-0 b/scripts/env/sofa-ci-windows10-0 index b1af42f..5f7976e 100644 --- a/scripts/env/sofa-ci-windows10-0 +++ b/scripts/env/sofa-ci-windows10-0 @@ -14,9 +14,9 @@ export VM_HAS_REQUIRED_LIBS="true" -export VM_MAKE_OPTIONS="-j5" +export VM_MAKE_OPTIONS="-j4" -export VM_MAX_PARALLEL_TESTS="5" +export VM_MAX_PARALLEL_TESTS="4" export VM_HAS_BULLET="false" diff --git a/scripts/env/sofa-ci-windows10-4 b/scripts/env/sofa-ci-windows10-4 index 807bfa0..5f7976e 100644 --- a/scripts/env/sofa-ci-windows10-4 +++ b/scripts/env/sofa-ci-windows10-4 @@ -1,7 +1,7 @@ #!/bin/bash -# Display Name sofa-ci-windows10-4 -# Name sofa-ci-windows10-4 +# Display Name sofa-ci-windows10-0 +# Name sofa-ci-windows10-0 # State Running # Template Windows 10 # Dynamically Scalable Yes @@ -32,14 +32,14 @@ export VM_HAS_OPENCASCADE="false" # TODO: Update FindOpenCascade.cmake in MeshST export VM_BOOST_PATH="C:/boost" -export VM_QT_PATH="C:/Qt/5.12.8" +export VM_QT_PATH="C:/Qt/5.12.12" export PYTHONIOENCODING="UTF-8" export PYTHONUSERBASE="C:/tmp/pythonuserbase" && mkdir -p "$PYTHONUSERBASE" && chmod -R 777 "$PYTHONUSERBASE" export VM_PYTHON_EXECUTABLE="C:/Python27/python.exe" export VM_PYTHON_PYTHONPATH="C:/Python27/Lib/site-packages" -export VM_PYTHON3_EXECUTABLE="C:/Python38/python.exe" -export VM_PYTHON3_PYTHONPATH="C:/Python38/Lib/site-packages" +export VM_PYTHON3_EXECUTABLE="C:/Python310/python.exe" +export VM_PYTHON3_PYTHONPATH="C:/Python310/Lib/site-packages" CI_PYTHON3_VERSION_WINDOWS="$(echo "$CI_PYTHON3_VERSION" | sed 's:\.::g')" if [[ -n "$CI_PYTHON3_VERSION_WINDOWS" ]] && [[ -e "C:/Python$CI_PYTHON3_VERSION_WINDOWS/python.exe" ]] && @@ -51,13 +51,13 @@ export VM_PYBIND11_CONFIG_EXECUTABLE="$VM_PYTHON3_EXECUTABLE -m pybind11" export VM_BULLET_PATH="" -export VM_ASSIMP_PATH="C:/assimp" +export VM_ASSIMP_PATH="C:/assimp/5.2.2/install" -export VM_CGAL_PATH="C:/CGAL" +export VM_CGAL_PATH="C:/cgal/5.4.1/install" export VM_OPENCASCADE_PATH="C:/OpenCascade/opencascade-7.4.0" -export VM_EIGEN3_PATH="C:/eigen/eigen-3.3.7" +export VM_EIGEN3_PATH="C:/eigen/eigen-3.4.0" export VM_NODEEDITOR_PATH="C:/NodeEditor/2.1.3/install"