aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaëtan Gilbert2018-09-21 22:00:49 +0200
committerGaëtan Gilbert2018-09-21 22:00:49 +0200
commit4d1de421c2df95503e4643f41903d214e0c2fb19 (patch)
tree42012ca5fd81161100dbdee1824d1a8140c9dc4b
parent6614041c46bff5c35abc7fe27e86b11504921d34 (diff)
parentc7050b099e13ed41773e0294daa27f35a76ea779 (diff)
Merge PR #8526: Fix Travis CI by pinning brew OPAM package to version 1.2.2.
-rw-r--r--.travis.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 766c76c29c..1a2c909c7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -166,7 +166,9 @@ matrix:
before_install:
- brew update
- brew unlink python
- - brew install opam gnu-time
+ - brew install gnu-time
+ # only way to continue using OPAM 1.2
+ - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/d156edeeed7291f4bc1e08620b331bbd05d52b78/Formula/opam.rb
- if: NOT (type = pull_request)
os: osx
@@ -183,7 +185,9 @@ matrix:
before_install:
- brew update
- brew unlink python
- - brew install opam gnu-time gtk+ expat gtksourceview gdk-pixbuf
+ - brew install gnu-time gtk+ expat gtksourceview gdk-pixbuf
+ # only way to continue using OPAM 1.2
+ - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/d156edeeed7291f4bc1e08620b331bbd05d52b78/Formula/opam.rb
- brew unlink python@2
- brew install python3
- pip3 install macpack