From 2357990ccea2f622992bc1d424eda30cd77ef082 Mon Sep 17 00:00:00 2001
From: gumi <mekolat@users.noreply.github.com>
Date: Wed, 16 Aug 2017 12:13:11 -0400
Subject: Update travis for ubuntu trusty

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index a5430dbce..594522d6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: c
 sudo: false
+dist: trusty
 addons:
   apt:
     sources:
@@ -7,12 +8,12 @@ addons:
 
 install:
   - ./tools/ci/travis.sh getplugins || true
-  
+
 before_script:
   - uname -a
   - ./tools/ci/travis.sh createdb ragnarok root
-  - ./tools/ci/travis.sh importdb ragnarok travis
-  - mysql -u root -e "SET PASSWORD FOR 'travis'@'localhost' = PASSWORD('travis');"
+  - ./tools/ci/travis.sh importdb ragnarok root
+  - ./tools/ci/travis.sh adduser ragnarok travis travis root
 
 script:
   - if [[ ! -z "${HPM}" ]]; then ./tools/ci/travis.sh buildhpm $CONFIGURE_FLAGS; fi
@@ -81,10 +82,10 @@ matrix:
         - ubuntu-toolchain-r-test
         packages:
         - gcc-6
-  
+
 notifications:
   email: false
-  
+
 branches:
   except:
     - rathena
-- 
cgit v1.2.3-60-g2f50