From 56ca87994b111814304fe91aab81c4a9886d2f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Borz=C3=AC?= <borzifrancesco@gmail.com>
Date: Thu, 17 Sep 2020 19:03:05 +0200
Subject: [PATCH] feat(CI): add support for GCC (#3314)

Co-authored-by: Viste <viste02@gmail.com>
---
 .github/workflows/core_build.yml                 | 16 ++++++++++++++--
 apps/ci/ci-install.sh                            | 13 +++++++++++++
 .../Kalimdor/ZulFarrak/instance_zulfarrak.cpp    |  2 ++
 .../scripts/Kalimdor/ZulFarrak/zulfarrak.h       |  1 -
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml
index e46060306..879d50e6b 100644
--- a/.github/workflows/core_build.yml
+++ b/.github/workflows/core_build.yml
@@ -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
diff --git a/apps/ci/ci-install.sh b/apps/ci/ci-install.sh
index bd77d1ef6..bce9a9acf 100755
--- a/apps/ci/ci-install.sh
+++ b/apps/ci/ci-install.sh
@@ -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
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index bc0ed85a6..b4bf5570b 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -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"
 
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
index 8ec5aa054..ee472a7f9 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
@@ -6,7 +6,6 @@
 #define DEF_ZULFARRACK_H
 
 #include "SpellScript.h"
-#include "GridNotifiers.h"
 #include "CellImpl.h"
 
 enum ZulFarrakData