summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOneric <oneric@oneric.stub>2020-07-02 20:22:19 +0200
committerOleg Oshmyan <chortos@inbox.lv>2020-07-05 21:23:18 +0300
commitfb7731c85daccc635bf67608d3f8e45d9b61d578 (patch)
treeb126d8d858c45a0386c9e320adeede58d6a70e18
parent7959e6172b1eff903284922c03f3fdc98bdc2f05 (diff)
downloadlibass-fb7731c85daccc635bf67608d3f8e45d9b61d578.tar.bz2
libass-fb7731c85daccc635bf67608d3f8e45d9b61d578.tar.xz
travis-ci: Fix build on macOS
`brew install` fails with an error when an older version is already installed. With the homebrew addon `brew install` or `brew upgrade` will be called as required
-rw-r--r--.travis.yml17
1 files changed, 15 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 3717261..25f3677 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,7 @@ branches:
- coverity_scan
before_install:
- - (sudo apt-get update || brew update)
- - (sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev nasm || brew install freetype fribidi nasm) && ./autogen.sh && ./configure
+ - ./autogen.sh && ./configure
script:
- make -j4
@@ -42,6 +41,20 @@ notifications:
on_failure: always
addons:
+ apt:
+ update: true
+ packages:
+ - libfontconfig1-dev
+ - libfreetype6-dev
+ - libfribidi-dev
+ - libharfbuzz-dev
+ - nasm
+ homebrew:
+ update: true
+ packages:
+ - freetype
+ - fribidi
+ - nasm
coverity_scan:
project:
name: "libass/libass"