From a0595b73e3fcfde53a205a3c3b760353ed14e9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Fri, 21 Dec 2018 14:37:57 +0100 Subject: [PATCH] CI: Update Ubuntu version of travis build to xenial (16.04) --- .travis.yml | 8 ++++++-- src/server/scripts/World/npcs_special.cpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93272f37b..f2bbd4f24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ sudo: required -dist: trusty # (14.04) -# xenial (16.04) is not supported yet +dist: xenial # (16.04) +# bionic (18.04) is not yet available in travis language: cpp compiler: @@ -10,6 +10,9 @@ addons: apt: update: true +services: + - mysql + git: depth: 1 @@ -33,6 +36,7 @@ install: - echo "DB_AUTH_CONF=\"MYSQL_USER='root'; MYSQL_PASS=''; MYSQL_HOST='127.0.0.1';\"" >> conf/config.sh - echo "DB_WORLD_CONF=\"MYSQL_USER='root'; MYSQL_PASS=''; MYSQL_HOST='127.0.0.1';\"" >> conf/config.sh # create and import mysql + - mysql -e "SET GLOBAL sql_mode = '';" # this is necessary because of mysql 5.7 - bash ./acore.sh "db-assembler" "import-all" script: diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 94fdf1512..f6310333c 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -770,7 +770,7 @@ public: return true; } - bool OnQuestComplete(Player* /*player*/, Creature* creature, Quest const* quest) + bool OnQuestComplete(Player* /*player*/, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_CLUCK) CAST_AI(npc_chicken_cluck::npc_chicken_cluckAI, creature->AI())->Reset();