diff --git a/appveyor.yml b/appveyor.yml index c71645d3e0..c840d7db53 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,8 +26,12 @@ build_script: services: mysql test_script: - cmd: >- + rem ======================================================================== + rem Set up the environment variables we need + rem ======================================================================== + set DB_HOST=127.0.0.1 set DB_ROOT=root @@ -44,53 +48,28 @@ test_script: cd C:\projects\rathena - rem TODO should be replace with tools\ci\sql.bat as soon as possible + rem ======================================================================== + rem MySQL database setup - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "CREATE DATABASE %DB_NAME%;" + rem ======================================================================== - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\main.sql" + call tools\ci\sql.bat - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\logs.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db2.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db_re.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2_re.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db_re.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2_re.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db_re.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2_re.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\roulette_default_data.sql" - - %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "GRANT SELECT,INSERT,UPDATE,DELETE ON %DB_NAME%.* TO '%DB_USER%'@'%DB_HOST%' IDENTIFIED BY '%DB_USERPW%';" + rem ======================================================================== rem Activate all custom and test scripts + rem ======================================================================== + start /d tools\ci npc.bat + rem ======================================================================== + rem Start the map server + rem ======================================================================== + login-server.exe --run-once char-server.exe --run-once diff --git a/tools/ci/sql.bat b/tools/ci/sql.bat index 2da0898cef..41ed133799 100644 --- a/tools/ci/sql.bat +++ b/tools/ci/sql.bat @@ -2,40 +2,25 @@ rem MySQL database setup -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "CREATE DATABASE %DB_NAME%;" +rem Use the `MYSQL_PWD` environment variable to avoid insecure warning. +set MYSQL_PWD=%DB_ROOTPW% -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\main.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\logs.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db2.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db_re.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2_re.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db_re.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2_re.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db_re.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2_re.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\roulette_default_data.sql" - -%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "GRANT SELECT,INSERT,UPDATE,DELETE ON %DB_NAME%.* TO '%DB_USER%'@'%DB_HOST%' IDENTIFIED BY '%DB_USERPW%';" +%MYSQL% -u %DB_ROOT% -e "CREATE DATABASE %DB_NAME%;" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\main.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\logs.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\item_cash_db.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\item_cash_db2.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\item_db.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\item_db2.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\item_db_re.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\item_db2_re.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\mob_db.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\mob_db2.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\mob_db_re.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\mob_db2_re.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\mob_skill_db.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\mob_skill_db2.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\mob_skill_db_re.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\mob_skill_db2_re.sql" +%MYSQL% -u %DB_ROOT% %DB_NAME% -e "source sql-files\roulette_default_data.sql" +%MYSQL% -u %DB_ROOT% -e "GRANT SELECT,INSERT,UPDATE,DELETE ON %DB_NAME%.* TO '%DB_USER%'@'%DB_HOST%' IDENTIFIED BY '%DB_USERPW%';"