GArik
diff --git a/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+11Lines changed: 11 additions & 0 deletions b/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎travis_config.sh
Copy file name to clipboardExpand all lines: travis_config.sh
+7-7Lines changed: 7 additions & 7 deletions b/‎travis_config.sh
Copy file name to clipboardExpand all lines: travis_config.sh
+7-7Lines changed: 7 additions & 7 deletions
diff --git a/‎travis_osx_build.sh
Copy file name to clipboardExpand all lines: travis_osx_build.sh
+39-8Lines changed: 39 additions & 8 deletions b/‎travis_osx_build.sh
Copy file name to clipboardExpand all lines: travis_osx_build.sh
+39-8Lines changed: 39 additions & 8 deletions
@@ -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
 
 
@@ -7,19 +7,19 @@ echo "===  Loading config.sh  === "
 
 # To see build progress
 function build_wheel {
-    build_bdist_wheel $@
+    if [ -n "$IS_OSX" ]; then
+      source travis_osx_build.sh
+      build_bdist_osx_wheel . $@ || return $?
+    else
+      build_bdist_wheel $@
+    fi
 }
 
 function bdist_wheel_cmd {
     # copied from multibuild's common_utils.sh
     # add osx deployment target so it doesnt default to 10.6
     local abs_wheelhouse=$1
-    if [ -n "$IS_OSX" ]; then
-        source travis_osx_build.sh
-        build_bdist_osx_wheel . $@ || return $?
-    else
-        CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
-    fi
+    CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
     cp dist/*.whl $abs_wheelhouse
     if [ -z "$IS_OSX" ]; then
       TOOLS_PATH=/opt/_internal/tools
 
@@ -10,22 +10,47 @@ 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 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
     git submodule update --init --recursive opencv
     git submodule update --init --recursive opencv_contrib
 
-    pip install scikit-build
-    pip install numpy
-
     if [ ! -d "$build_dir" ]; then
         mkdir "$build_dir"
     fi
@@ -132,7 +157,8 @@ 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)"
+                ccache -s
+                goto_exit
                 return 1
             fi
             make -j${num_cpus} "$m"
@@ -141,6 +167,7 @@ function pre_build_osx {
         fi
     done
     make -j${num_cpus}
+    ccache -s
 }
 
 function build_osx {
@@ -176,9 +203,13 @@ function build_osx {
 function build_bdist_osx_wheel {
     local repo_dir=$(abspath ${1:-$REPO_DIR})
     [ -z "$repo_dir" ] && echo "repo_dir not defined" && exit 1
+    local wheelhouse=$(abspath ${WHEEL_SDIR:-wheelhouse})
+    start_spinner
+    if [ -n "$(is_function "pre_build")" ]; then pre_build; fi
+    stop_spinner
+    pip install scikit-build
+    pip install numpy
     pre_build_osx "$repo_dir" || return $?
-    if [ -n "$BUILD_DEPENDS" ]; then
-        pip install $(pip_opts) $BUILD_DEPENDS
-    fi
     build_osx "$repo_dir"
+    repair_wheelhouse "$wheelhouse"
 }