travis: clean

groonga · Apr 10, 2018 · 8faaa14 · 8faaa14
1 parent 74cda81
commit 8faaa14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/travis/Dockerfile.ubuntu-14.04 b/travis/Dockerfile.ubuntu-14.04
@@ -31,7 +31,8 @@ RUN \
   apt install -qq -y cutter-testing-framework
 
 RUN \
-  gem2.0 install bundler
+  gem2.0 install \
+    bundler
 
 RUN \
   useradd --user-group --create-home groonga
@@ -59,11 +60,16 @@ RUN make -j$(nproc) > /dev/null
 RUN \
   mkdir -p /tmp/local/var/log/groonga/httpd/
 
+RUN \
+  rsync -a --include "*.rb" --include "*/" --exclude "*" \
+    ../source/plugins/ \
+    plugins/
+
 RUN \
   mkdir -p test/command && \
-  cp -a \
-    ../source/test/command/suite \
-    test/command/suite
+  rsync -a --delete \
+    ../source/test/command/suite/ \
+    test/command/suite/
 
 CMD \
   BUILD_DIR=test/unit \

diff --git a/travis/Dockerfile.ubuntu-16.04 b/travis/Dockerfile.ubuntu-16.04
@@ -36,8 +36,8 @@ RUN \
 RUN \
   gem install \
     bundler \
-    pkg-config \
-    groonga-client
+    groonga-client \
+    pkg-config
 
 RUN \
   useradd --user-group --create-home groonga