summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/ci-osx-deps.sh6
-rw-r--r--.travis.yml32
2 files changed, 31 insertions, 7 deletions
diff --git a/.ci/ci-osx-deps.sh b/.ci/ci-osx-deps.sh
deleted file mode 100755
index 838dd2dc05..0000000000
--- a/.ci/ci-osx-deps.sh
+++ /dev/null
@@ -1,6 +0,0 @@
1#!/bin/sh
2
3brew update
4brew unlink python
5brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 pulseaudio ccache ninja python3 libffi
6pip3 install meson
diff --git a/.travis.yml b/.travis.yml
index c85f52e709..980a029c35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,36 @@ cache:
6sudo: required 6sudo: required
7dist: trusty 7dist: trusty
8 8
9osx_image: xcode10.2
10
11addons:
12 homebrew:
13 packages:
14 - gettext
15 - check
16 - bullet
17 - dbus
18 - fontconfig
19 - freetype
20 - fribidi
21 - gst-plugins-good
22 - gstreamer
23 - luajit
24 - openssl
25 - webp
26 - libsndfile
27 - glib
28 - libspectre
29 - libraw
30 - librsvg
31 - poppler
32 - lz4
33 - pulseaudio
34 - ccache
35 - ninja
36 - python3
37 - libffi
38
9env: 39env:
10 global: 40 global:
11 - EIO_MONITOR_POLL=1 41 - EIO_MONITOR_POLL=1
@@ -47,7 +77,7 @@ before_install:
47 rm -rf $HOME/Library/Caches/Homebrew 77 rm -rf $HOME/Library/Caches/Homebrew
48 rm -rf $HOME/cachedir/Homebrew/Homebrew 78 rm -rf $HOME/cachedir/Homebrew/Homebrew
49 mv $HOME/cachedir/Homebrew $HOME/Library/Caches/Homebrew 79 mv $HOME/cachedir/Homebrew $HOME/Library/Caches/Homebrew
50 .ci/ci-osx-deps.sh 80 pip3 install meson
51 fi 81 fi
52 82
53before_script: 83before_script: