8000 Minor fixes in build logic by native-api · Pull Request #197 · opencv/opencv-python · GitHub
[go: up one dir, main page]
Skip to content

Minor fixes in build logic #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 17, 2019
Merged

Minor fixes in build logic #197

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a49c1b1
Fix values of mismatch detection variables carrying over to the next …
native-api May 1, 2019
3844f7a
Fix removing old built opencv_ffmpeg when a new upstream formula is a…
native-api May 1, 2019
144e61c
Don't print bogus error message when cache warmup is complete
native-api May 1, 2019
583d126
Fix "Error: broken pipe" if `brew info` gives lots of output
native-api May 2, 2019
d0dbb05
CentOS 5 ccache doesn't have --show-stats
native-api May 2, 2019
d4a5198
Use latest cmake for the main build, too, with better Python support
native-api May 1, 2019
e1523c8
JSON format change for formula without any bottles
native-api May 2, 2019
c4286d2
Speed up repeat checks for the same deps
native-api May 3, 2019
42b3519
Add prefix to all files related to CI rather than project
native-api May 4, 2019
d6a45ba
(dummy commit to rerun checks)
native-api May 8, 2019
fac2703
Revert "Use latest cmake for the main build, too, with better Python …
native-api Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Speed up repeat checks for the same deps
  • Loading branch information
@native-api
native-api committed May 3, 2019
commit c4286d26c3f9763a502e17c852855a4303e4c771
85 changes: 49 additions & 36 deletions travis_osx_brew_cache.sh
View file 10000
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ export HOMEBREW_NO_INSTALL_CLEANUP=1
# see https://docs.brew.sh/Manpage , "info formula" section
export HOMEBREW_NO_GITHUB_API=1


#Packages already installed in the current session to avoid checking them again
_BREW_ALREADY_INSTALLED='$' #$ = illegal package name; a blank line would cause macos grep to swallow everything


#Public functions
Expand All @@ -37,39 +38,8 @@ function brew_install_and_cache_within_time_limit {
# use bottle if available, build and cache bottle if not.
# Terminate and exit with status 1 if this takes too long.
# Exit with status 2 on any other error.
( set -eE -o pipefail; trap '{ sleep 3; exit 2; }' ERR

local PACKAGE TIME_LIMIT TIME_HARD_LIMIT TIME_START
PACKAGE="${1:?}" || exit 2
TIME_LIMIT=${2:-$BREW_TIME_LIMIT} || exit 2
TIME_HARD_LIMIT=${3:-$BREW_TIME_HARD_LIMIT} || exit 2
TIME_START=${4:-$BREW_TIME_START} || exit 2

local BUILD_FROM_SOURCE INCLUDE_BUILD KEG_ONLY

if brew list --versions "$PACKAGE" >/dev/null && ! (brew outdated | grep -qxF "$PACKAGE"); then
echo "Already installed and the latest version: $PACKAGE"
return 0
fi


_brew_is_bottle_available "$PACKAGE" KEG_ONLY || BUILD_FROM_SOURCE=1
[ -n "$BUILD_FROM_SOURCE" ] && INCLUDE_BUILD="--include-build" || true

# Whitespace is illegal in package names so converting all whitespace into single spaces due to no quotes is okay.
DEPS=`brew deps "$PACKAGE" $INCLUDE_BUILD` || exit 2
for dep in $DEPS; do
#TIME_LIMIT only has to be met if we'll be actually building the main project this iteration, i.e. after the "root" module installation
#While we don't know that yet, we can make better use of Travis-given time with a laxer limit
#We still can't overrun TIME_HARD_LIMIT as that would't leave time to save the cache
brew_install_and_cache_within_time_limit "$dep" $(((TIME_LIMIT+TIME_HARD_LIMIT)/2)) "$TIME_HARD_LIMIT" "$TIME_START" || exit $?
done

_brew_check_slow_building_ahead "$PACKAGE" "$TIME_START" "$TIME_HARD_LIMIT" || exit $?
_brew_install_and_cache "$PACKAGE" "$([[ -z "$BUILD_FROM_SOURCE" ]] && echo 1 || echo 0)" "$KEG_ONLY" || exit 2
_brew_check_elapsed_build_time "$TIME_START" "$TIME_LIMIT" || exit $?
) \
|| if test $? -eq 1; then brew_go_bootstrap_mode; return 1; else return 2; fi #must run this in current process
_brew_install_and_cache_within_time_limit $@ \
|| if test $? -eq 1; then brew_go_bootstrap_mode; return 1; else return 2; fi
}

function brew_add_local_bottles {
Expand Down Expand Up @@ -246,6 +216,46 @@ function brew_go_bootstrap_mode {

#Internal functions

function _brew_install_and_cache_within_time_limit {
# This fn is run with || so errexit can't be enabled

local PACKAGE TIME_LIMIT TIME_HARD_LIMIT TIME_START MARKED_INSTALLED
PACKAGE="${1:?}" || return 2
TIME_LIMIT=${2:-$BREW_TIME_LIMIT} || return 2
TIME_HARD_LIMIT=${3:-$BREW_TIME_HARD_LIMIT} || return 2
TIME_START=${4:-$BREW_TIME_START} || return 2

if grep -qxFf <(cat <<<"$_BREW_ALREADY_INSTALLED") <<<"$PACKAGE"; then
MARKED_INSTALLED=1
fi

if [ -n "$MARKED_INSTALLED" ] || (brew list --versions "$PACKAGE" >/dev/null && ! (brew outdated | grep -qxF "$PACKAGE")); then
echo "Already installed and the latest version: $PACKAGE"
if [ -z "$MARKED_INSTALLED" ]; then _brew_mark_installed "$PACKAGE"; fi
return 0
fi

local BUILD_FROM_SOURCE INCLUDE_BUILD KEG_ONLY

_brew_is_bottle_available "$PACKAGE" KEG_ONLY || BUILD_FROM_SOURCE=1
[ -n "$BUILD_FROM_SOURCE" ] && INCLUDE_BUILD="--include-build" || true

# Whitespace is illegal in package names so converting all whitespace into single spaces due to no quotes is okay.
DEPS=`brew deps "$PACKAGE" $INCLUDE_BUILD` || return 2
DEPS=`grep -vxF <(cat <<<"$_BREW_ALREADY_INSTALLED") <<<"$DEPS"` || test $? -eq 1 || return 2
for dep in $DEPS; do
#TIME_LIMIT only has to be met if we'll be actually building the main project this iteration, i.e. after the "root" module installation
#While we don't know that yet, we can make better use of Travis-given time with a laxer limit
#We still can't overrun TIME_HARD_LIMIT as that would't leave time to save the cache
_brew_install_and_cache_within_time_limit "$dep" $(((TIME_LIMIT+TIME_HARD_LIMIT)/2)) "$TIME_HARD_LIMIT" "$TIME_START" || return $?
done

_brew_check_slow_building_ahead "$PACKAGE" "$TIME_START" "$TIME_HARD_LIMIT" || return $?
_brew_install_and_cache "$PACKAGE" "$([[ -z "$BUILD_FROM_SOURCE" ]] && echo 1 || echo 0)" "$KEG_ONLY" || return 2
_brew_check_elapsed_build_time "$TIME_START" "$TIME_LIMIT" || return $?
}


function _brew_parse_bottle_json {
# Parse JSON file resulting from `brew bottle --json`
# and save data into specified variables
Expand Down Expand Up @@ -386,10 +396,13 @@ function _brew_install_and_cache {
echo "$CACHED_BOTTLE" >"$BOTTLE_LINK"

fi

_brew_mark_installed "$PACKAGE"
}



function _brew_mark_installed {
_BREW_ALREADY_INSTALLED="$_BREW_ALREADY_INSTALLED"$'\n'"${1:?}"
}

function _brew_check_elapsed_build_time {
# If time limit has been reached,
Expand Down
0