From fb7731c85daccc635bf67608d3f8e45d9b61d578 Mon Sep 17 00:00:00 2001 From: Oneric Date: Thu, 2 Jul 2020 20:22:19 +0200 Subject: 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 --- .travis.yml | 17 +++++++++++++++-- 1 file 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" -- cgit v1.2.3