Skip to content

Commit b3cfd88

Browse files
committed
Having Travis working again
1 parent f948d63 commit b3cfd88

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

.travis.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ addons:
1111
- liblmdb-dev
1212
- cppcheck
1313

14+
homebrew:
15+
packages:
16+
- cppcheck
17+
- libmaxminddb
18+
- lmdb
19+
- yajl
20+
update: true
21+
1422
language: cpp
1523

1624
compiler:
@@ -21,6 +29,8 @@ os:
2129
- linux
2230
- osx
2331

32+
osx_image: xcode12
33+
2434
env:
2535
- OPTS="--enable-parser-generation $OPTS"
2636
- OPTS="--without-curl $OPTS"
@@ -31,17 +41,15 @@ env:
3141
- OPTS="--without-lua $OPTS"
3242
- OPTS="--without-maxmind $OPTS"
3343

44+
3445
before_script:
3546
- echo $TRAVIS_OS_NAME
36-
- '[ "$TRAVIS_OS_NAME" != osx ] || brew update'
37-
- '[ "$TRAVIS_OS_NAME" != osx ] || brew install cppcheck'
38-
- '[ "$TRAVIS_OS_NAME" != osx ] || brew install libmaxminddb'
39-
- '[ "$TRAVIS_OS_NAME" != osx ] || brew install lmdb'
4047
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo add-apt-repository --yes ppa:maxmind/ppa'
4148
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get update'
4249
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-cache search maxmind'
4350
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get install -y libmaxminddb-dev'
4451

52+
4553
script:
4654
- ./build.sh
4755
- ./configure $OPTS

0 commit comments

Comments
 (0)