From 37ca8cb3bc2dc2b231219a1ca0f5709af8d967a4 Mon Sep 17 00:00:00 2001 From: triplus Date: Thu, 28 Nov 2019 20:36:45 +0100 Subject: [PATCH] Travis - re-enable incremental ccache builds Each build job should now have an unique cache entry. This should increase the reliability and success rate for build jobs, when the maximum time limit is exceeded. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c5b954e24..fab2ec052b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -303,11 +303,11 @@ script: winpty.exe -Xallow-non-tty -Xplain /C/Users/travis/build/FreeCAD/FreeCAD/build/bin/FreeCADCmd.exe --run-test 0 | tee runlog.txt grep -q FAILED runlog.txt ; [ $? == 1 ] && echo "Build succeeded and tests passed!" || ( echo "Tests failed!" && false ) else - # Stop compiling (GCC) after 2 hrs 15 min (2 hrs 30 min limit). Extended to 180 min. + # Stop compiling (GCC) after 2 hrs 50 min (3 hrs limit). # Preserves created ccache for the next build job. - # if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo timeout -k 140m 135m make -j2 install || true; fi - # if [ "${TRAVIS_OS_NAME}" == "osx" ]; then sudo make -j2 install; fi - sudo make -j2 install + if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo timeout -k 175m 170m make -j2 install || true; fi + if [ "${TRAVIS_OS_NAME}" == "osx" ]; then sudo make -j2 install; fi + # sudo make -j2 install ${INSTALLED_APP_PATH} --console --run-test 0 || travis_terminate 1 ${INSTALLED_APP_PATH} --log-file /tmp/FreeCAD_installed.log & sleep 10 && pkill FreeCAD