diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2016-10-16 20:41:50 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2016-10-16 20:42:14 +0100 |
| commit | da2026e764e3d3b242b9ae480b8a9ba28e3c8d63 (patch) | |
| tree | c8c26fe19353ad724973f155b2a1b78ea200c11d | |
| parent | e5f21a8478d269d61bb2ced9968e8781e781d663 (diff) | |
Yet more 6.x -> master renames
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | contrib/merge_updates_unix.sh | 4 | ||||
| -rw-r--r-- | contrib/merge_updates_windows.bat | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 5f5dfba44d8..7be8d4564a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,13 +28,13 @@ script: - $CXX --version - mysql -uroot < sql/create/create_mysql.sql - mysql -utrinity -ptrinity auth < sql/base/auth_database.sql - - ./contrib/check_updates.sh auth 6.x auth + - ./contrib/check_updates.sh auth master auth - mysql -utrinity -ptrinity characters < sql/base/characters_database.sql - - ./contrib/check_updates.sh characters 6.x characters + - ./contrib/check_updates.sh characters master characters - mysql -utrinity -ptrinity world < sql/base/dev/world_database.sql - mysql -utrinity -ptrinity hotfixes < sql/base/dev/hotfixes_database.sql - - cat sql/updates/world/6.x/*.sql | mysql -utrinity -ptrinity world - - cat sql/updates/hotfixes/6.x/*.sql | mysql -utrinity -ptrinity hotfixes + - cat sql/updates/world/master/*.sql | mysql -utrinity -ptrinity world + - cat sql/updates/hotfixes/master/*.sql | mysql -utrinity -ptrinity hotfixes - mysql -uroot < sql/create/drop_mysql.sql - cd bin - make -j 8 -k && make install diff --git a/contrib/merge_updates_unix.sh b/contrib/merge_updates_unix.sh index 42499e68932..355289d8588 100644 --- a/contrib/merge_updates_unix.sh +++ b/contrib/merge_updates_unix.sh @@ -1,2 +1,2 @@ -cat ../sql/updates/world/*.sql > world_update.sql -cat ../sql/updates/hotfixes/*.sql > hotfixes_update.sql +cat ../sql/updates/world/master/*.sql > world_update.sql +cat ../sql/updates/hotfixes/master/*.sql > hotfixes_update.sql diff --git a/contrib/merge_updates_windows.bat b/contrib/merge_updates_windows.bat index f70bd1bcb5b..9539a542ea5 100644 --- a/contrib/merge_updates_windows.bat +++ b/contrib/merge_updates_windows.bat @@ -1,2 +1,2 @@ -copy /a ..\sql\updates\world\*.sql /b world_updates.sql -copy /a ..\sql\updates\hotfixes\*.sql /b hotfixes_updates.sql +copy /a ..\sql\updates\world\master\*.sql /b world_updates.sql +copy /a ..\sql\updates\hotfixes\master\*.sql /b hotfixes_updates.sql |