Kouhei Sutou
null+****@clear*****
Sat Apr 7 22:37:23 JST 2018
Kouhei Sutou 2018-04-07 22:37:23 +0900 (Sat, 07 Apr 2018) New Revision: 2251d73c7aa8cffcc1f61a6cc4a55a4f4d7d70e2 https://github.com/groonga/groonga/commit/2251d73c7aa8cffcc1f61a6cc4a55a4f4d7d70e2 Message: travis: run test on Ubuntu 14.04 Modified files: .travis.yml Renamed files: travis/before-script.sh (from tools/travis-before-script.sh) travis/install.sh (from tools/travis-install.sh) travis/script.sh (from tools/travis-script.sh) Modified: .travis.yml (+16 -3) =================================================================== --- .travis.yml 2018-04-07 22:33:45 +0900 (65e27db97) +++ .travis.yml 2018-04-07 22:37:23 +0900 (c15e7e6ff) @@ -2,7 +2,14 @@ notifications: email: recipients: - groonga-commit �� lists.osdn.me + language: cpp + +sudo: required + +services: + - docker + matrix: include: - os: linux @@ -38,17 +45,23 @@ matrix: - os: osx compiler: clang env: BUILD_TOOL=cmake ENABLE_MRUBY=yes + - os: linux + env: DOCKER=ubuntu-14.04 # allow_failures: # - os: osx # compiler: clang # env: BUILD_TOOL=autotools ENABLE_MRUBY=yes + before_install: # - rvm use 2.3.1 --install --binary --fuzzy # - rvm use 2.2 - gem update bundler + install: - - tools/travis-install.sh + - travis/install.sh + before_script: - - tools/travis-before-script.sh + - travis/before-script.sh + script: - - tools/travis-script.sh + - travis/script.sh Renamed: travis/before-script.sh (+9 -2) 86% =================================================================== --- tools/travis-before-script.sh 2018-04-07 22:33:45 +0900 (87ed5756a) +++ travis/before-script.sh 2018-04-07 22:37:23 +0900 (f5e4e51df) @@ -3,9 +3,16 @@ set -e set -u -: ${ENABLE_MRUBY:=no} +if [ -n "${DOCKER}" ]; then + ./autogen.sh + docker build \ + -t groonga/groonga-${DOCKER} \ + -f travis/Dockefile.${DOCKER} \ + . + exit 0 +fi -git submodule update --init --depth 1 +: ${ENABLE_MRUBY:=no} prefix=/tmp/local Renamed: travis/install.sh (+9 -0) 85% =================================================================== --- tools/travis-install.sh 2018-04-07 22:33:45 +0900 (28662f4fe) +++ travis/install.sh 2018-04-07 22:37:23 +0900 (30ab92389) @@ -5,6 +5,15 @@ set -u : ${ENABLE_MRUBY:=no} +git submodule update --init --depth 1 + +if [ -n "${DOCKER}" ]; then + sudo apt-get install -qq -y \ + autotools-dev \ + autoconf-archive + exit 0 +fi + case "${TRAVIS_OS_NAME}" in linux) curl --silent --location https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh Renamed: travis/script.sh (+8 -0) 93% =================================================================== --- tools/travis-script.sh 2018-04-07 22:33:45 +0900 (cc0457254) +++ travis/script.sh 2018-04-07 22:37:23 +0900 (62d77be05) @@ -6,6 +6,14 @@ set -u : ${ENABLE_MRUBY:=no} : ${TEST_TARGET:=all} +if [ -n "${DOCKER}" ]; then + docker run \ + --interactive \ + --tty \ + groonga/groonga-${DOCKER} + exit 0 +fi + prefix=/tmp/local command_test_options="--reporter=mark --timeout=60" -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180407/35365949/attachment-0001.htm
