diff options
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | apps/installer/includes/os_configs/ubuntu.sh | 21 | ||||
| -rwxr-xr-x | install.sh | 2 |
3 files changed, 26 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index a3900b532d..1dabf6c3e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,14 @@ git: before_install: - git config user.email "travis@build.bot" && git config user.name "Travis CI" - - cd bin/ + - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd bin/; fi # import pending sql - - bash acore-db-pendings - - cd .. + - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash acore-db-pendings; fi + - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd ..; fi # push changes to git if any - - git fetch --unshallow - - git checkout master - - git diff --quiet --exit-code --cached && git add -A . && git commit -am "Importing pending sql" && git push https://$GITHUB_API_KEY@github.com/azerothcore/azerothcore-wotlk.git master; + - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git fetch --unshallow; fi + - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git checkout $TRAVIS_BRANCH; fi + - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git add -A . && git diff --cached --quiet || git commit -am "Importing pending sql" && git push https://$GITHUB_API_KEY@github.com/$TRAVIS_REPO_SLUG.git $TRAVIS_BRANCH; fi install: # install OS deps (apt-get) diff --git a/apps/installer/includes/os_configs/ubuntu.sh b/apps/installer/includes/os_configs/ubuntu.sh index 6ed4117ed6..4881781561 100644 --- a/apps/installer/includes/os_configs/ubuntu.sh +++ b/apps/installer/includes/os_configs/ubuntu.sh @@ -1,5 +1,20 @@ +UBUNTU_VERSION=$(lsb_release -sr); -sudo apt-get install -y git cmake make gcc g++ clang libmysqlclient-dev \ -libssl-dev=1.0.2g-1ubuntu4.8 libbz2-dev libreadline-dev libncurses-dev \ -mysql-server libace-6.* libace-dev +if [[ $TRAVIS && $CONTINUOUS_INTEGRATION ]]; then + sudo apt-get -y install build-essential libtool make cmake cmake-data clang openssl libgoogle-perftools-dev \ + libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev +else + case $UBUNTU_VERSION in + "14.04") + sudo apt-get -y install build-essential libtool make cmake cmake-data gcc g++ clang openssl libgoogle-perftools-dev \ + libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev mysql-server libncurses-dev + ;; + *) + sudo apt-get install -y git cmake make gcc g++ clang libmysqlclient-dev \ + libssl-dev=1.0.2g-1ubuntu4.8 libbz2-dev libreadline-dev libncurses-dev \ + mysql-server libace-6.* libace-dev + ;; + esac +fi + diff --git a/install.sh b/install.sh index af88b78e1a..24a8320b4a 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PATH_APPS="$CUR_PATH/apps/" PATH_MODULES="$CUR_PATH/modules/" |