feat(CI): add support for GCC (#3314)

Co-authored-by: Viste <viste02@gmail.com>
This commit is contained in:
Francesco Borzì
2020-09-17 19:03:05 +02:00
committed by GitHub
parent d76c8caba0
commit 56ca87994b
4 changed files with 29 additions and 3 deletions

View File

@@ -13,12 +13,24 @@ jobs:
matrix:
# the result of the matrix will be the combination of all attributes, so we get os*compiler*modules builds
os: [ubuntu-20.04]
compiler: [clang6, clang9, clang10]
compiler: [clang]
modules: [with, without]
# we can include specific combinations here
include:
- os: ubuntu-20.04
compiler: clang9
modules: without
- os: ubuntu-18.04
compiler: clang
compiler: clang # default in 18.04 is clang 6
modules: without
- os: ubuntu-18.04
compiler: gcc # default in 18.04 is gcc 7
modules: without
- os: ubuntu-20.04
compiler: gcc # default in 20.04 is gcc 9
modules: without
- os: ubuntu-20.04
compiler: gcc10
modules: without
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.modules }}-modules

View File

@@ -26,6 +26,19 @@ time ./acore.sh install-deps
case $COMPILER in
# this is in order to use the "default" gcc version of the OS, without forcing a specific version
"gcc" )
time sudo apt-get install -y gcc g++
echo "CCOMPILERC=\"gcc\"" >> ./conf/config.sh
echo "CCOMPILERCXX=\"g++\"" >> ./conf/config.sh
;;
"gcc10" )
time sudo apt-get install -y gcc-10 g++-10
echo "CCOMPILERC=\"gcc-10\"" >> ./conf/config.sh
echo "CCOMPILERCXX=\"g++-10\"" >> ./conf/config.sh
;;
# this is in order to use the "default" clang version of the OS, without forcing a specific version
"clang" )
time sudo apt-get install -y clang

View File

@@ -5,6 +5,8 @@
#include "ScriptMgr.h"
#include "InstanceScript.h"
#include "zulfarrak.h"
#include "GridNotifiers.h"
#include "GridNotifiersImpl.h"
#include "Player.h"
#include "TemporarySummon.h"

View File

@@ -6,7 +6,6 @@
#define DEF_ZULFARRACK_H
#include "SpellScript.h"
#include "GridNotifiers.h"
#include "CellImpl.h"
enum ZulFarrakData