public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(CI/Travis): use Ubuntu 18.04 + update min clang version (#2232)

Browse Source
This commit is contained in:
Francesco Borzì
2019-08-25 10:22:11 +02:00
committed by GitHub
parent 39719da4a8
commit f031d418e3
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -1,6 +1,5 @@
sudo: required sudo: required
dist: xenial # (16.04) dist: bionic # (18.04)
# bionic (18.04) is not yet available in travis
language: cpp language: cpp

9
apps/ci/ci-before_install.sh
View File

@@ -4,8 +4,8 @@ set -e
if [ "$TRAVIS_BUILD_ID" = "1" ] if [ "$TRAVIS_BUILD_ID" = "1" ]
then then
export CCOMPILERC="clang-3.8" export CCOMPILERC="clang-6.0"
export CCOMPILERCXX="clang++-3.8" export CCOMPILERCXX="clang++-6.0"
echo "set root password" echo "set root password"
export DB_RND_NAME=$(cat /dev/urandom | tr -dc 'a-z' | fold -w 5 | head -n 1) export DB_RND_NAME=$(cat /dev/urandom | tr -dc 'a-z' | fold -w 5 | head -n 1)
@@ -18,9 +18,4 @@ elif [ "$TRAVIS_BUILD_ID" = "2" ]
then then
export CCOMPILERC="clang-7" export CCOMPILERC="clang-7"
export CCOMPILERCXX="clang++-7" export CCOMPILERCXX="clang++-7"
echo "add custom APT repository llvm-toolchain-xenial-7"
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" | sudo tee -a /etc/apt/sources.list
sudo apt-get update -qq
fi fi

4
apps/ci/ci-install.sh
View File

@@ -7,8 +7,8 @@ bash ./acore.sh "install-deps"
if [ "$TRAVIS_BUILD_ID" = "1" ] if [ "$TRAVIS_BUILD_ID" = "1" ]
then then
echo "install clang-3.8" echo "install clang-6.0"
sudo apt-get install clang-3.8 sudo apt-get install clang-6.0
elif [ "$TRAVIS_BUILD_ID" = "2" ] elif [ "$TRAVIS_BUILD_ID" = "2" ]
then then
echo "install clang-7" echo "install clang-7"

4
src/common/Cryptography/OpenSSLCrypto.cpp
View File

@@ -22,6 +22,7 @@ static void lockingCallback(int mode, int type, const char* /*file*/, int /*line
static void threadIdCallback(CRYPTO_THREADID * id) static void threadIdCallback(CRYPTO_THREADID * id)
{ {
(void)id;
/// ACE_thread_t turns out to be a struct under Mac OS. /// ACE_thread_t turns out to be a struct under Mac OS.
#ifndef __APPLE__ #ifndef __APPLE__
CRYPTO_THREADID_set_numeric(id, ACE_Thread::self()); CRYPTO_THREADID_set_numeric(id, ACE_Thread::self());
@@ -37,7 +38,10 @@ void OpenSSLCrypto::threadsSetup()
{ {
cryptoLocks[i] = new ACE_Thread_Mutex(); cryptoLocks[i] = new ACE_Thread_Mutex();
} }
(void)&threadIdCallback;
CRYPTO_THREADID_set_callback(threadIdCallback); CRYPTO_THREADID_set_callback(threadIdCallback);
(void)&lockingCallback;
CRYPTO_set_locking_callback(lockingCallback); CRYPTO_set_locking_callback(lockingCallback);
} }