diff options
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rw-r--r-- | sql/updates/world/2014_07_21_00_world_misc.sql | 3 | ||||
| -rw-r--r-- | sql/updates/world/2014_07_21_01_world_misc.sql | 2 |
3 files changed, 7 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index aaddb44274e..ffff5ea5253 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,29 +10,14 @@ before_install: - sudo apt-get install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl libssl-dev libmysqlclient15-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libboost1.55-dev libboost-thread1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev - mkdir bin - cd bin - - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=1 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Release + - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=1 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Release -script: if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make CFLAGS='-O0' CXXFLAGS='-O0' -j16 ; fi +script: make -j 16 branches: only: - master - 4.3.4 - - coverity_scan git: depth: 1 - -env: - global: - - secure: "n8J4aCfW8adZJbUPvKFM4HXkJ1pxaHfWnFNbcqma7aGETes3q7vN5jDuX2D9kplM9Er83Gl1ygiunocty8ncLLJqnP8+86bHUY5Q79qiYIL0Ak10CDBYck6TQKCCIT2NCRVRHVHkqYhad873tJ38qCfGW+G+t8nOSOWEsHAbxrE=" - -addons: - coverity_scan: - project: - name: "TrinityCore/TrinityCore" - description: "Build submitted via Travis CI" - notification_email: dnpd.dd@gmail.com - build_command_prepend: "" - build_command: "make -j16" - branch_pattern: coverity_scan diff --git a/sql/updates/world/2014_07_21_00_world_misc.sql b/sql/updates/world/2014_07_21_00_world_misc.sql new file mode 100644 index 00000000000..4e649dc52d4 --- /dev/null +++ b/sql/updates/world/2014_07_21_00_world_misc.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` = 19768); +UPDATE creature_template_addon SET `bytes1`=0, `bytes2`=0 WHERE `entry` IN (19762, 19768, 19784); diff --git a/sql/updates/world/2014_07_21_01_world_misc.sql b/sql/updates/world/2014_07_21_01_world_misc.sql new file mode 100644 index 00000000000..46d6e43ab63 --- /dev/null +++ b/sql/updates/world/2014_07_21_01_world_misc.sql @@ -0,0 +1,2 @@ +-- +UPDATE `quest_template` SET `RequiredRaces`=0 WHERE `Id` IN (834,835); |