Try not to exit the build when timeout is reached

GArik · GArik · commit 85a0964dda7e · 2021-01-21T19:12:40.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -85,6 +85,7 @@ install: |
       python setup.py sdist
     else
       build_wheel $REPO_DIR $PLAT
+      ret_code=$?
     fi
 
     set +x
@@ -105,8 +106,18 @@ script: |
     trap ERR
     test "$rc" -eq 0
 
+after_failure: |
+    # after_failure
+    echo "Error code after <install>:" $ret_code
+
 after_success: |
     # Upload wheels to pypi if tag is set
+    if [[ $SDIST != 0 ]]; then
+      echo "Error code after <install>:" $ret_code
+      if [[ $ret_code != 0 ]]; then
+        exit $ret_code
+      fi
+    fi
 
     set -x; set +e
 
diff --git a/travis_config.sh b/travis_config.sh
@@ -7,7 +7,7 @@ echo "===  Loading config.sh  === "
 
 # To see build progress
 function build_wheel {
-    build_bdist_wheel $@
+    build_bdist_wheel $@ || return $?
 }
 
 function bdist_wheel_cmd {
@@ -16,19 +16,23 @@ function bdist_wheel_cmd {
     local abs_wheelhouse=$1
     if [ -n "$IS_OSX" ]; then
         source travis_osx_build.sh
-        build_bdist_osx_wheel . $@ || return $?
+        build_bdist_osx_wheel . $@
     else
         CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
     fi
-    cp dist/*.whl $abs_wheelhouse
-    if [ -z "$IS_OSX" ]; then
-      TOOLS_PATH=/opt/_internal/tools
-      /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
-      source $TOOLS_PATH/bin/activate
-      python patch_auditwheel_whitelist.py
-      deactivate
+    local err_code=$?
+    if [ -n "$USE_CCACHE" ]; then ccache -s; fi
+    if [ $err_code -eq 0 ]; then
+        cp dist/*.whl $abs_wheelhouse
+        if [ -z "$IS_OSX" ]; then
+            TOOLS_PATH=/opt/_internal/tools
+            /opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
+            source $TOOLS_PATH/bin/activate
+            python patch_auditwheel_whitelist.py
+            deactivate
+        fi
     fi
-    if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
+    return $err_code
 }
 
 if [ -n "$IS_OSX" ]; then
diff --git a/travis_osx_build.sh b/travis_osx_build.sh
@@ -10,13 +10,43 @@ function package_name() {
     wheel_name=$name
 }
 
+# Terminate the build but ensure saving the cache
+function goto_exit {
+    local EXIT_CODE=${1:-1}
+
+    echo "Exiting build"
+
+    # Can't just `exit` because that would terminate the build without saving the cache
+    # Have to replace further actions with no-ops
+
+    local MESSAGE=""; if [ "$EXIT_CODE" -ne 0 ]; then
+        MESSAGE='Building package took too long. Restart the build in Travis UI to continue from cache.';
+    fi
+
+    set +e
+
+    eval '
+    function '"$cmd"' { return 0; }
+    function repair_wheelhouse { return 0; }
+    function install_run {'\
+        "$(if [ -n "$MESSAGE" ]; then
+            echo \
+        '        echo -e "\n'"$MESSAGE"'\n"'
+        fi)"\
+    '
+        # Travis runs user scripts via `eval` i.e. in the same shell process.
+        # So have to unset errexit in order to get to cache save stage
+        set +e; return '"$EXIT_CODE"'
+    }'
+}
+
 function pre_build_osx {
     local repo_dir=$(abspath ${1:-$REPO_DIR})
     local build_dir="$repo_dir/opencv/build"
     local num_cpus=$(sysctl -n hw.ncpu)
     num_cpus=${num_cpus:-4}
     local travis_start_time=$(($TRAVIS_TIMER_START_TIME/10**9))
-    local time_limit=$((30*60))
+    local time_limit=$((25*60))
 
     cd "$repo_dir"
     git submodule sync
@@ -132,7 +162,7 @@ function pre_build_osx {
             # Check time limit (3min should be enough for a module to built)
             local projected_time=$(($(date +%s) - travis_start_time + 3 * 60))
             if [ $projected_time -ge $time_limit ]; then
-                echo "*** Not enough time to build $m: $((projected_time/60))m (${projected_time}s)"
+                goto_exit
                 return 1
             fi
             make -j${num_cpus} "$m"
