yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed travis compilation (#769)

Browse Source
This commit is contained in:
Yehonal
2018-01-28 19:50:01 +01:00
committed by GitHub
parent cdbfac743d
commit 19bf454e5f
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@@ -11,14 +11,14 @@ git:
before_install: before_install:
- git config user.email "travis@build.bot" && git config user.name "Travis CI" - 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 # import pending sql
- bash acore-db-pendings - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash acore-db-pendings; fi
- cd .. - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd ..; fi
# push changes to git if any # push changes to git if any
- git fetch --unshallow - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git fetch --unshallow; fi
- git checkout master - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git checkout $TRAVIS_BRANCH; fi
- 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 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:
# install OS deps (apt-get) # install OS deps (apt-get)

21
apps/installer/includes/os_configs/ubuntu.sh
View File

@@ -1,5 +1,20 @@
UBUNTU_VERSION=$(lsb_release -sr);
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
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

2
install.sh
View File

@@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
PATH_APPS="$CUR_PATH/apps/" PATH_APPS="$CUR_PATH/apps/"
PATH_MODULES="$CUR_PATH/modules/" PATH_MODULES="$CUR_PATH/modules/"