Skip to content

Commit

Permalink
Travis/OS X: Use 'brew bundle' + Brewfile
Browse files Browse the repository at this point in the history
This ensures that the build script will not fail if the Homebrew
dependencies are already installed.
  • Loading branch information
stephengroat authored and dcommander committed Jan 3, 2018
1 parent 0e2bca0 commit 3847f91
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ matrix:
before_install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew update &&
brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 &&
brew bundle &&
ln -fs /usr/local/bin/gpg1 /usr/local/bin/gpg &&
git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
ln -fs /Applications/Xcode.app /Applications/Xcode72.app;
Expand Down
4 changes: 4 additions & 0 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
brew 'nasm'
brew 'gcc@5'
brew 'md5sha1sum'
cask 'Caskroom/versions/java6'
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \
doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \
jstdhuff.c jdcoefct.h jdmainct.h jdmaster.h jdsample.h \
md5/CMakeLists.txt
md5/CMakeLists.txt Brewfile

dist-hook:
rm -rf `find $(distdir) -name .svn`
Expand Down

0 comments on commit 3847f91

Please sign in to comment.