summaryrefslogtreecommitdiff
path: root/util/travis/before_install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'util/travis/before_install.sh')
-rwxr-xr-xutil/travis/before_install.sh12
1 files changed, 11 insertions, 1 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index ea85b3db6..a4328fa46 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -1,7 +1,15 @@
#!/bin/bash -e
echo "Preparing for $TRAVIS_COMMIT_RANGE"
-. util/travis/common.sh
+if [[ "$LINT" == "1" ]]; then
+ curl http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+ sudo add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main"
+ sudo apt-get -yq update
+ sudo apt-get install clang-format-3.9
+ exit 0
+fi
+
+. util/travis/common.sh
needs_compile || exit 0
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
@@ -11,6 +19,7 @@ fi
if [[ $PLATFORM == "Unix" ]]; then
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
+ sudo apt-get update
sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
@@ -21,6 +30,7 @@ if [[ $PLATFORM == "Unix" ]]; then
if [[ "$VALGRIND" == "1" ]]; then
sudo apt-get install valgrind
fi
+
else
brew update
brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit