[Groonga-commit] groonga/groonga at 8faaa14 [master] travis: clean

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Apr 10 15:47:40 JST 2018


Kouhei Sutou	2018-04-10 15:47:40 +0900 (Tue, 10 Apr 2018)

  New Revision: 8faaa14a082b60ade024a40f853b8f93edc1a772
  https://github.com/groonga/groonga/commit/8faaa14a082b60ade024a40f853b8f93edc1a772

  Message:
    travis: clean

  Modified files:
    travis/Dockerfile.ubuntu-14.04
    travis/Dockerfile.ubuntu-16.04

  Modified: travis/Dockerfile.ubuntu-14.04 (+10 -4)
===================================================================
--- travis/Dockerfile.ubuntu-14.04    2018-04-10 15:10:34 +0900 (700021364)
+++ travis/Dockerfile.ubuntu-14.04    2018-04-10 15:47:40 +0900 (6e8e3dd93)
@@ -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
@@ -60,10 +61,15 @@ 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 \

  Modified: travis/Dockerfile.ubuntu-16.04 (+2 -2)
===================================================================
--- travis/Dockerfile.ubuntu-16.04    2018-04-10 15:10:34 +0900 (4a73ef269)
+++ travis/Dockerfile.ubuntu-16.04    2018-04-10 15:47:40 +0900 (0eb1da0f2)
@@ -36,8 +36,8 @@ RUN \
 RUN \
   gem install \
     bundler \
-    pkg-config \
-    groonga-client
+    groonga-client \
+    pkg-config
 
 RUN \
   useradd --user-group --create-home groonga
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180410/1e566563/attachment-0001.htm 



More information about the Groonga-commit mailing list
Back to archive index