From 1ab19e8bd7df2af3f53eb4036ba177b06ef03cb4 Mon Sep 17 00:00:00 2001
From: nothink <nothing@yasagure.jp>
Date: Tue, 14 Aug 2018 14:09:13 +0900
Subject: [PATCH] Renew travis.yml for current HEAD

---
 .travis.yml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e97b6286..5a634979 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,15 +22,14 @@ matrix:
         - sudo -i -u postgres createdb szuru_test
         - sudo -i -u postgres psql -c "ALTER USER szuru PASSWORD 'dog';"
         - cd server
-        - cp config.yaml.dist ../config.yaml.dist
-        - cp config.yaml.dist ../config.yaml
-        - sed -i -e 's/^#debug:/debug:/' ../config.yaml
-        - sed -i -e 's/^#show_sql:/show_sql:/' ../config.yaml
-        - sed -i -e 's/^#data_url:/data_url:/' ../config.yaml
-        - sed -i -e 's/^#data_dir:/data_dir:/' ../config.yaml
-        - sed -i -e 's/^#database:$/database:\ postgres:\/\/szuru:dog@localhost:5432\/szuru_test/' ../config.yaml
-        - sed -i -e 's/^#elasticsearch:/elasticsearch:/' ../config.yaml
-        - sed -i -e 's/^#    /    /' ../config.yaml
+        - cp config.yaml.dist config.yaml
+        - sed -i -e 's/^#debug:/debug:/' config.yaml
+        - sed -i -e 's/^#show_sql:/show_sql:/' config.yaml
+        - sed -i -e 's/^#data_url:/data_url:/' config.yaml
+        - sed -i -e 's/^#data_dir:/data_dir:/' config.yaml
+        - sed -i -e 's/^#database:$/database:\ postgres:\/\/szuru:dog@localhost:5432\/szuru_test/' config.yaml
+        - sed -i -e 's/^#elasticsearch:/elasticsearch:/' config.yaml
+        - sed -i -e 's/^#    /    /' config.yaml
       install:
         - pip install -r requirements.txt
         - pip install -r dev-requirements.txt
@@ -53,15 +52,14 @@ matrix:
         - sudo -i -u postgres createdb szuru_test
         - sudo -i -u postgres psql -c "ALTER USER szuru PASSWORD 'dog';"
         - cd server
-        - cp config.yaml.dist ../config.yaml.dist
-        - cp config.yaml.dist ../config.yaml
-        - sed -i -e 's/^#debug:/debug:/' ../config.yaml
-        - sed -i -e 's/^#show_sql:/show_sql:/' ../config.yaml
-        - sed -i -e 's/^#data_url:/data_url:/' ../config.yaml
-        - sed -i -e 's/^#data_dir:/data_dir:/' ../config.yaml
-        - sed -i -e 's/^#database:$/database:\ postgres:\/\/szuru:dog@localhost:5432\/szuru_test/' ../config.yaml
-        - sed -i -e 's/^#elasticsearch:/elasticsearch:/' ../config.yaml
-        - sed -i -e 's/^#    /    /' ../config.yaml
+        - cp config.yaml.dist config.yaml
+        - sed -i -e 's/^#debug:/debug:/' config.yaml
+        - sed -i -e 's/^#show_sql:/show_sql:/' config.yaml
+        - sed -i -e 's/^#data_url:/data_url:/' config.yaml
+        - sed -i -e 's/^#data_dir:/data_dir:/' config.yaml
+        - sed -i -e 's/^#database:$/database:\ postgres:\/\/szuru:dog@localhost:5432\/szuru_test/' config.yaml
+        - sed -i -e 's/^#elasticsearch:/elasticsearch:/' config.yaml
+        - sed -i -e 's/^#    /    /' config.yaml
       install:
         - pip install -r requirements.txt
         - pip install -r dev-requirements.txt