Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reenabled buildbot defines

Browse Source 
Now builds will fail if any warnings or errors occur.

Removed duplicated "matrix" keyword I added accidentally in 3108bb1.
Removed a default warning in run once mode in the character server. Follow up to a0b3e51
This commit is contained in:
Lemongrass3110 2016-10-19 23:58:29 +02:00
parent 3108bb1265
commit dd555926a0
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -41,11 +41,10 @@ env:
- DB_PASS="ragnarok"
- PACKETDBVER=45
matrix:
matrix:
- CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no"
- CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=no"
- CONFIGURE_FLAGS="--enable-prere=no --enable-vip=yes"
- CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=yes"
- CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable_buildbot=yes"
- CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=no --enable_buildbot=yes"
- CONFIGURE_FLAGS="--enable-prere=no --enable-vip=yes --enable_buildbot=yes"
- CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=yes --enable_buildbot=yes"
notifications:
email: false

12
appveyor.yml
View File

@ -10,24 +10,28 @@ environment:
matrix:
- VisualStudioVersion: 10.0
Solution: rAthena-10.sln
Defines: "BUILDBOT"
- VisualStudioVersion: 11.0
Solution: rAthena-12.sln
Defines: "BUILDBOT"
- VisualStudioVersion: 12.0
Solution: rAthena-13.sln
Defines: "BUILDBOT"
- VisualStudioVersion: 14.0
Solution: rAthena-14.sln
Defines: "BUILDBOT"
- VisualStudioVersion: 10.0
Solution: rAthena-10.sln
Defines: PRERE
Defines: "BUILDBOT;PRERE"
- VisualStudioVersion: 11.0
Solution: rAthena-12.sln
Defines: PRERE
Defines: "BUILDBOT;PRERE"
- VisualStudioVersion: 12.0
Solution: rAthena-13.sln
Defines: PRERE
Defines: "BUILDBOT;PRERE"
- VisualStudioVersion: 14.0
Solution: rAthena-14.sln
Defines: PRERE
Defines: "BUILDBOT;PRERE"
platform:
- Win32
configuration:

3
src/char/char.c
View File

@ -3190,7 +3190,8 @@ int do_init(int argc, char **argv)
char_sql_config_read(SQL_CONF_NAME);
msg_config_read(MSG_CONF_NAME_EN);
if (strcmp(charserv_config.userid, "s1")==0 && strcmp(charserv_config.passwd, "p1")==0) {
// Skip this check if the server is run with run-once flag
if (runflag!=CORE_ST_STOP && strcmp(charserv_config.userid, "s1")==0 && strcmp(charserv_config.passwd, "p1")==0) {
ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n");