diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4f8ce03e9..04c9559ec0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,10 @@ before_script: - - 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 - - echo "yes" | sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main' - - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - + - git checkout -b master + - echo "yes" | add-apt-repository ppa:kalakris/cmake + - echo "yes" | add-apt-repository ppa:boost-latest/ppa + - echo "yes" | add-apt-repository ppa:ubuntu-toolchain-r/test + - echo "yes" | add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main' + - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - - apt-get -yqq update - apt-get -yqq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl clang-3.5 - apt-get -yqq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libzmq3-dev @@ -17,7 +18,7 @@ install: - cd bin - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" - cd .. - - sudo chmod +x contrib/check_updates.sh + - chmod +x contrib/check_updates.sh - $CXX --version - mysql -uroot < sql/create/create_mysql.sql - mysql -utrinity -ptrinity auth < sql/base/auth_database.sql