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

Commit 3844f7a

Browse filesBrowse files
committed
Fix removing old built opencv_ffmpeg when a new upstream formula is available
Happened in https://travis-ci.org/skvark/opencv-python/builds/518179810 S1 jobs
1 parent a49c1b1 commit 3844f7a
Copy full SHA for 3844f7a

File tree

1 file changed

+1
-1
lines changed
Filter options

1 file changed

+1
-1
lines changed

‎config.sh

Copy file name to clipboardExpand all lines: config.sh
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function pre_build {
9292
#after the cache stage, all bottles and Homebrew metadata should be already cached locally
9393
if [ -n "$CACHE_STAGE" ]; then
9494
brew update
95+
generate_ffmpeg_formula
9596
brew_add_local_bottles
9697
fi
9798

@@ -107,7 +108,6 @@ function pre_build {
107108
echo 'Installing FFmpeg'
108109

109110
if [ -n "$CACHE_STAGE" ]; then
110-
generate_ffmpeg_formula
111111
brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
112112
else
113113
brew install ffmpeg_opencv

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.