Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

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
Revert "Use latest cmake for the main build, too, with better Python … 
…support

This reverts commit d4a5198.

cmake 3.14 can't find py3 installation when "python" points to Python 3 while cmake 3.9 can
  • Loading branch information
@native-api
native-api committed Jun 13, 2019
commit fac2703ffcc7ad810ce9a0af119d95bd03048fb9
4 changes: 0 additions & 4 deletions 4 travis_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ function pre_build {
brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
else
brew install ffmpeg_opencv
#cmake is a build dependency of ffmpeg so a bottle should be present in cache
if (brew outdated | grep -qxF cmake) || ! (brew list | grep -qxF cmake); then
_brew_install_and_cache cmake 1 0
fi
fi

if [ -n "$CACHE_STAGE" ]; then
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.