From e2cbed7c1618cac566a27fe37ecfe8f0301e39f7 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 15 May 2020 02:12:48 +0200 Subject: [PATCH 1/1] bump osx version on travis --- .travis.yml | 2 +- tools/jenkins/project_description.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a21494c00..4633f46c96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,7 @@ jobs: - df -h - du -hc /tmp || true - os: osx - osx_image: xcode11.3 + osx_image: xcode11.4 script: - export LIBRARY_PATH=/usr/local/lib/gcc/9 - cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=ON -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh index 17c40c765e..49ddd11e17 100755 --- a/tools/jenkins/project_description.sh +++ b/tools/jenkins/project_description.sh @@ -184,10 +184,10 @@ do os="Ubuntu 18.04 bionic" elif [ ${OS[$id]} == "osx" ]; then node="travis-mac (log)" - os="Mac OS X Mojave (10.14) " + os="Mac OS X Catalina (10.15) " elif [ ${OS[$id]} == "windows" ]; then node="travis-windows (log)" - os="Windows 10 v17134" + os="Windows Server 1809" fi boost=$(get_boost) compiler=$(get_compiler) -- 2.20.1