Kouhei Sutou 2019-05-21 17:57:05 +0900 (Tue, 21 May 2019) Revision: d063e47c650dbdc0ad3e6edd1f37156294fa896c https://github.com/groonga/groonga/commit/d063e47c650dbdc0ad3e6edd1f37156294fa896c Message: travis: use addons Modified files: .travis.yml travis/install.sh Modified: .travis.yml (+50 -3) =================================================================== --- .travis.yml 2019-05-20 16:22:40 +0900 (1d13a2b25) +++ .travis.yml 2019-05-21 17:57:05 +0900 (037c63fa9) @@ -12,11 +12,37 @@ services: cache: - ccache +addons_linux_build: &addons_linux_build + apt: + packages: + - autotools-dev + - autotools-dev + - autoconf-archive + - zlib1g-dev + - libmsgpack-dev + - libevent-dev + - libmecab-dev + - mecab-naist-jdic + - cmake + - gdb + +addons_macos_build: &addons_macos_build + homebrew: + brewfile: true + +addons_linux_docker: &addons_linux_docker + apt: + packages: + - autotools-dev + - autoconf-archive + matrix: include: - name: "Autotools" os: linux compiler: gcc + addons: + <<: *addons_linux_build env: - BUILD_TOOL=autotools - CFLAGS=-funsigned-char @@ -24,12 +50,16 @@ matrix: - name: "Autotools: mruby" os: linux compiler: gcc + addons: + <<: *addons_linux_build env: - BUILD_TOOL=autotools - ENABLE_MRUBY=yes - name: "Autotools: mruby: optimize" os: linux compiler: gcc + addons: + <<: *addons_linux_build env: - BUILD_TOOL=autotools - ENABLE_MRUBY=yes @@ -37,23 +67,31 @@ matrix: - name: "Autotools: clang" os: linux compiler: clang + addons: + <<: *addons_linux_build env: - BUILD_TOOL=autotools - ENABLE_MRUBY=yes - name: "CMake" os: linux compiler: gcc + addons: + <<: *addons_linux_build env: - BUILD_TOOL=cmake - name: "CMake: mruby" os: linux compiler: gcc + addons: + <<: *addons_linux_build env: - BUILD_TOOL=cmake - ENABLE_MRUBY=yes - name: "CMake: clang" os: linux compiler: clang + addons: + <<: *addons_linux_build env: - BUILD_TOOL=cmake - ENABLE_MRUBY=yes @@ -61,37 +99,46 @@ matrix: os: osx compiler: clang osx_image: xcode10.2 + addons: + <<: *addons_macos_build env: - BUILD_TOOL=autotools - ENABLE_MRUBY=yes - name: "CMake: macOS" os: osx compiler: clang + addons: + <<: *addons_macos_build env: - BUILD_TOOL=cmake - ENABLE_MRUBY=yes - name: "Ubuntu 16.04" os: linux + addons: + <<: *addons_linux_docker env: - DOCKER=ubuntu-16.04 - name: "Ubuntu 18.04" os: linux + addons: + <<: *addons_linux_docker env: - DOCKER=ubuntu-18.04 - name: "MinGW32" os: linux + addons: + <<: *addons_linux_build env: - TARGET=windows - ARCHITECTURES=x86 - name: "MinGW64" os: linux + addons: + <<: *addons_linux_build env: - TARGET=windows - ARCHITECTURES=x64 -before_install: - - gem update bundler - install: - travis/install.sh Modified: travis/install.sh (+0 -15) =================================================================== --- travis/install.sh 2019-05-20 16:22:40 +0900 (1f71c88ad) +++ travis/install.sh 2019-05-21 17:57:05 +0900 (1094a86b6) @@ -13,9 +13,6 @@ if [ -n "${DOCKER}" ]; then --silent \ --location \ https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh - sudo apt-get install -qq -y \ - autotools-dev \ - autoconf-archive exit $? fi @@ -33,16 +30,6 @@ case "${TRAVIS_OS_NAME}" in --silent \ --location \ https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh - sudo apt-get install -qq -y \ - autotools-dev \ - autoconf-archive \ - zlib1g-dev \ - libmsgpack-dev \ - libevent-dev \ - libmecab-dev \ - mecab-naist-jdic \ - cmake \ - gdb if [ "${ENABLE_DOCUMENT}" = "yes" ]; then sudo apt-get install -qq -y \ python3-pip @@ -50,8 +37,6 @@ case "${TRAVIS_OS_NAME}" in fi ;; osx) - brew update > /dev/null - brew bundle --verbose || : # Ignore error for now: TODO: Remove me if [ "${ENABLE_DOCUMENT}" = "yes" ]; then pip3 install Sphinx fi -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190521/4857ddfe/attachment-0001.html>
