summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-09-12 01:05:28 +0200
committerHaru <haru@dotalux.com>2016-10-02 17:26:06 +0200
commit0933e9bb5b3842252ced04a3c523511ade68d743 (patch)
tree618e43ad0ba3d840c1d271ac97f4be47ea0890da
parent1407b6acbc4f3fa12b4a8dc77f8e1ef42a6f0463 (diff)
downloadhercules-0933e9bb5b3842252ced04a3c523511ade68d743.tar.gz
hercules-0933e9bb5b3842252ced04a3c523511ade68d743.tar.bz2
hercules-0933e9bb5b3842252ced04a3c523511ade68d743.tar.xz
hercules-0933e9bb5b3842252ced04a3c523511ade68d743.zip
Moved travis.sh to tools/ci
Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--.travis.yml10
-rwxr-xr-xtools/ci/travis.sh (renamed from travis.sh)0
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 62f2f7cbc..28f4387a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,17 +9,17 @@ addons:
- gcc-6
install:
- - ./travis.sh getplugins || true
+ - ./tools/ci/travis.sh getplugins || true
before_script:
- uname -a
- - ./travis.sh createdb ragnarok root
- - ./travis.sh importdb ragnarok travis
+ - ./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');"
script:
- - ./travis.sh build $CONFIGURE_FLAGS
- - ./travis.sh test ragnarok travis travis
+ - ./tools/ci/travis.sh build $CONFIGURE_FLAGS
+ - ./tools/ci/travis.sh test ragnarok travis travis
# We can't use this, unfortunately
# http://github.com/travis-ci/travis-ci/issues/979
diff --git a/travis.sh b/tools/ci/travis.sh
index db1ea5315..db1ea5315 100755
--- a/travis.sh
+++ b/tools/ci/travis.sh