feat(CI): add support for GCC (#3314)
Co-authored-by: Viste <viste02@gmail.com>
This commit is contained in:
@@ -13,12 +13,24 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
# the result of the matrix will be the combination of all attributes, so we get os*compiler*modules builds
|
# the result of the matrix will be the combination of all attributes, so we get os*compiler*modules builds
|
||||||
os: [ubuntu-20.04]
|
os: [ubuntu-20.04]
|
||||||
compiler: [clang6, clang9, clang10]
|
compiler: [clang]
|
||||||
modules: [with, without]
|
modules: [with, without]
|
||||||
# we can include specific combinations here
|
# we can include specific combinations here
|
||||||
include:
|
include:
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
compiler: clang9
|
||||||
|
modules: without
|
||||||
- os: ubuntu-18.04
|
- 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
|
modules: without
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.modules }}-modules
|
name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.modules }}-modules
|
||||||
|
|||||||
@@ -26,6 +26,19 @@ time ./acore.sh install-deps
|
|||||||
|
|
||||||
case $COMPILER in
|
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
|
# this is in order to use the "default" clang version of the OS, without forcing a specific version
|
||||||
"clang" )
|
"clang" )
|
||||||
time sudo apt-get install -y clang
|
time sudo apt-get install -y clang
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "InstanceScript.h"
|
#include "InstanceScript.h"
|
||||||
#include "zulfarrak.h"
|
#include "zulfarrak.h"
|
||||||
|
#include "GridNotifiers.h"
|
||||||
|
#include "GridNotifiersImpl.h"
|
||||||
#include "Player.h"
|
#include "Player.h"
|
||||||
#include "TemporarySummon.h"
|
#include "TemporarySummon.h"
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#define DEF_ZULFARRACK_H
|
#define DEF_ZULFARRACK_H
|
||||||
|
|
||||||
#include "SpellScript.h"
|
#include "SpellScript.h"
|
||||||
#include "GridNotifiers.h"
|
|
||||||
#include "CellImpl.h"
|
#include "CellImpl.h"
|
||||||
|
|
||||||
enum ZulFarrakData
|
enum ZulFarrakData
|
||||||
|
|||||||
Reference in New Issue
Block a user