aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-07-27 15:29:02 +0100
committerDDuarte <dnpd.dd@gmail.com>2014-07-27 15:29:02 +0100
commitf162bce473205ccf70d9322cc0b36a7430152cdb (patch)
tree06925fc39d6037103250fbfe52e467f9effac1ca
parent7c498a0cf960b43b6974d99f0cf265911c296711 (diff)
CI/Travis: Compile all branches
Also added master and 4.3.4 build status to the README
-rw-r--r--.travis.yml16
-rw-r--r--README.md5
2 files changed, 10 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 9be57a5afb6..97d35a9b30a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,18 +6,16 @@ before_install:
- echo "yes" | sudo add-apt-repository ppa:kalakris/cmake
- echo "yes" | sudo add-apt-repository ppa:boost-latest/ppa
- echo "yes" | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
- - sudo apt-get update -qq
- - sudo apt-get install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl libssl-dev libmysqlclient15-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libboost1.55-dev libboost-thread1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev
+ - sudo apt-get -qq update
+ - sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl
+ - sudo apt-get -qq libssl-dev libmysqlclient15-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev
+ - sudo apt-get -qq libboost1.55-dev libboost-thread1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev
+
+script:
- mkdir bin
- cd bin
- cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=1 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Release
-
-script: make -j 8
-
-branches:
- only:
- - master
- - 4.3.4
+ - make -j 8
git:
depth: 1
diff --git a/README.md b/README.md
index d89fd842687..fdb05c81eb4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
# ![logo](http://www.trinitycore.org/f/public/style_images/1_trinitycore.png) TrinityCore
-[![Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=master)](https://travis-ci.org/TrinityCore/TrinityCore)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/435/badge.svg)](https://scan.coverity.com/projects/435)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/435/badge.svg)](https://scan.coverity.com/projects/435)
+`3.3.5`: [![3.3.5 Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=master)](https://travis-ci.org/TrinityCore/TrinityCore)
+`4.3.4`: [![4.3.4 Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=4.3.4)](https://travis-ci.org/TrinityCore/TrinityCore)
## Introduction