Kouhei Sutou 2019-02-27 15:03:43 +0900 (Wed, 27 Feb 2019) Revision: 2f6ce8b8ff7efed7888b230f9a7509810a41efb6 https://github.com/groonga/groonga/commit/2f6ce8b8ff7efed7888b230f9a7509810a41efb6 Message: travis: enable Apache Arrow Modified files: .travis.yml Brewfile travis/Dockerfile.ubuntu-14.04 travis/Dockerfile.ubuntu-16.04 travis/Dockerfile.ubuntu-18.04 travis/script.sh Modified: .travis.yml (+30 -36) =================================================================== --- .travis.yml 2019-02-27 14:55:00 +0900 (9c1447731) +++ .travis.yml 2019-02-27 15:03:43 +0900 (4319cb592) @@ -11,84 +11,78 @@ services: matrix: include: - - os: linux + - name: "Autotools" + os: linux compiler: gcc env: - BUILD_TOOL=autotools - - os: linux + - CFLAGS=-funsigned-char + - CXXFLAGS=-funsigned-char + - name: "Autotools: mruby" + os: linux compiler: gcc env: - BUILD_TOOL=autotools - ENABLE_MRUBY=yes - - os: linux - compiler: gcc + - name: "Autotools: clang" + os: linux + compiler: clang env: - BUILD_TOOL=autotools - - CFLAGS=-funsigned-char - - CXXFLAGS=-funsigned-char - - os: linux + - ENABLE_MRUBY=yes + - name: "CMake" + os: linux compiler: gcc env: - BUILD_TOOL=cmake - - os: linux + - name: "CMake: mruby" + os: linux compiler: gcc env: - BUILD_TOOL=cmake - ENABLE_MRUBY=yes - - os: linux - compiler: clang - env: - - BUILD_TOOL=autotools - - ENABLE_MRUBY=yes - - os: linux + - name: "CMake: clang" + os: linux compiler: clang env: - BUILD_TOOL=cmake - ENABLE_MRUBY=yes - - os: osx - compiler: clang - env: - - BUILD_TOOL=autotools - - ENABLE_MRUBY=yes - - TEST_TARGET=command - - os: osx - compiler: clang - env: - - BUILD_TOOL=autotools - - ENABLE_MRUBY=yes - - TEST_TARGET=command-http - - os: osx + - name: "Autotools: macOS" + os: osx compiler: clang env: - BUILD_TOOL=autotools - ENABLE_MRUBY=yes - - TEST_TARGET=command-httpd - - os: osx + - name: "CMake: macOS" + os: osx compiler: clang env: - BUILD_TOOL=cmake - ENABLE_MRUBY=yes - - os: linux + - name: "Ubuntu 14.04" + os: linux env: - DOCKER=ubuntu-14.04 - - os: linux + - name: "Ubuntu 16.04" + os: linux env: - DOCKER=ubuntu-16.04 - - os: linux + - name: "Ubuntu 18.04" + os: linux env: - DOCKER=ubuntu-18.04 - - os: linux + - name: "MinGW32" + os: linux env: - TARGET=windows - ARCHITECTURES=x86 - - os: linux + - name: "MinGW64" + os: linux env: - TARGET=windows - ARCHITECTURES=x64 before_install: - # - rvm use 2.3.1 --install --binary --fuzzy - # - rvm use 2.2 - gem update bundler install: Modified: Brewfile (+1 -0) =================================================================== --- Brewfile 2019-02-27 14:55:00 +0900 (7e6251769) +++ Brewfile 2019-02-27 15:03:43 +0900 (224a45063) @@ -1,3 +1,4 @@ +brew "apache-arrow" brew "autoconf-archive" # brew "cutter" brew "libevent" Modified: travis/Dockerfile.ubuntu-14.04 (+10 -0) =================================================================== --- travis/Dockerfile.ubuntu-14.04 2019-02-27 14:55:00 +0900 (9dd9c4df3) +++ travis/Dockerfile.ubuntu-14.04 2019-02-27 15:03:43 +0900 (1a712fb0e) @@ -33,6 +33,16 @@ RUN \ apt install -qq -y cutter-testing-framework RUN \ + apt update -qq && \ + apt install -qq -y apt-transport-https lsb-release && \ + wget -O /usr/share/keyrings/apache-arrow-keyring.gpg \ + https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-keyring.gpg && \ + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/ $(lsb_release --codename --short) main" > \ + /etc/apt/sources.list.d/apache-arrow.list && \ + apt update -qq && \ + apt install -qq -y libarrow-dev + +RUN \ ruby2.0 -r yaml -r rubygems/safe_yaml -S \ gem2.0 install \ bundler -v "< 2" && \ Modified: travis/Dockerfile.ubuntu-16.04 (+10 -0) =================================================================== --- travis/Dockerfile.ubuntu-16.04 2019-02-27 14:55:00 +0900 (578a3431b) +++ travis/Dockerfile.ubuntu-16.04 2019-02-27 15:03:43 +0900 (9fd1cb9bc) @@ -34,6 +34,16 @@ RUN \ apt install -qq -y cutter-testing-framework RUN \ + apt update -qq && \ + apt install -qq -y apt-transport-https lsb-release && \ + wget -O /usr/share/keyrings/apache-arrow-keyring.gpg \ + https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-keyring.gpg && \ + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/ $(lsb_release --codename --short) main" > \ + /etc/apt/sources.list.d/apache-arrow.list && \ + apt update -qq && \ + apt install -qq -y libarrow-dev + +RUN \ gem install \ bundler \ grntest \ Modified: travis/Dockerfile.ubuntu-18.04 (+10 -0) =================================================================== --- travis/Dockerfile.ubuntu-18.04 2019-02-27 14:55:00 +0900 (b9eb5a780) +++ travis/Dockerfile.ubuntu-18.04 2019-02-27 15:03:43 +0900 (02b7c775d) @@ -36,6 +36,16 @@ RUN \ # apt install -qq -y cutter-testing-framework RUN \ + apt update -qq && \ + apt install -qq -y apt-transport-https lsb-release && \ + wget -O /usr/share/keyrings/apache-arrow-keyring.gpg \ + https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-keyring.gpg && \ + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/ $(lsb_release --codename --short) main" > \ + /etc/apt/sources.list.d/apache-arrow.list && \ + apt update -qq && \ + apt install -qq -y libarrow-dev + +RUN \ gem install \ bundler \ groonga-client \ Modified: travis/script.sh (+12 -24) =================================================================== --- travis/script.sh 2019-02-27 14:55:00 +0900 (2be16bbc4) +++ travis/script.sh 2019-02-27 15:03:43 +0900 (926c8fb11) @@ -65,31 +65,19 @@ fi case "${BUILD_TOOL}" in autotools) case "${TEST_TARGET}" in - command) - test/command/run-test.sh ${command_test_options} - ;; - command-http) - retry test/command/run-test.sh ${command_test_options} \ - --interface http - ;; - command-httpd) - mkdir -p ${prefix}/var/log/groonga/httpd - retry test/command/run-test.sh ${command_test_options} \ - --testee groonga-httpd - ;; - *) + if [ "${TRAVIS_OS_NAME}" != "osx" ]; then test/unit/run-test.sh -v v - test/command/run-test.sh ${command_test_options} - if [ "${ENABLE_MRUBY}" = "yes" ]; then - test/mruby/run-test.rb - test/command_line/run-test.rb - fi - retry test/command/run-test.sh ${command_test_options} \ - --interface http - mkdir -p ${prefix}/var/log/groonga/httpd - retry test/command/run-test.sh ${command_test_options} \ - --testee groonga-httpd - ;; + fi + test/command/run-test.sh ${command_test_options} + if [ "${ENABLE_MRUBY}" = "yes" ]; then + test/mruby/run-test.rb + test/command_line/run-test.rb + fi + retry test/command/run-test.sh ${command_test_options} \ + --interface http + mkdir -p ${prefix}/var/log/groonga/httpd + retry test/command/run-test.sh ${command_test_options} \ + --testee groonga-httpd esac ;; cmake) -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190227/096245c2/attachment-0001.html>
