This is an automated email from the ASF dual-hosted git repository. huor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hawq.git
The following commit(s) were added to refs/heads/master by this push: new 154d290 HAWQ-1751. Fix Travis CI build 154d290 is described below commit 154d290cb7db424a63d79bc4a363d095dea7ccbf Author: wang.ziming <wang.zim...@oushu.io> AuthorDate: Wed Aug 21 09:22:11 2019 +0800 HAWQ-1751. Fix Travis CI build --- .travis.yml | 33 ++++++++++++++++++---- GNUmakefile.in | 3 -- depends/dbcommon/.gitignore | 1 + depends/storage/.gitignore | 1 + depends/storage/CMake/FindJSON.cmake | 2 +- .../src/storage/format/orc/orc-format-writer.cc | 2 +- .../storage/src/storage/format/orc/orc-format.h | 2 +- depends/univplan/.gitignore | 1 + 8 files changed, 33 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a437b3..a58e81e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ before_install: install: - brew reinstall Gsasl + boost bison ccache cpanm @@ -43,7 +44,12 @@ install: - brew reinstall protobuf protobuf-c - thrift + thrift@0.9 + glog + lz4 + libiconv + jsoncpp + hadoop - brew outdated libyaml || brew upgrade libyaml - git clone https://github.com/json-c/json-c.git - pushd json-c @@ -54,26 +60,41 @@ install: - make install - popd - rm -rf ./json-c - - ln -s /usr/local/opt/apr/libexec/lib/libapr-1.0.dylib /usr/local/lib/ + - brew link --force thrift@0.9 - ln -s /usr/local/opt/apr/libexec/lib/libapr-1.dylib /usr/local/lib/ - ln -s /usr/local/opt/apr/libexec/bin/apr-1-config /usr/local/bin/apr-1-config - - brew uninstall boost --ignore-dependencies - - brew install homebrew/core/boost@1.60 - - brew link boost@1.60 --force + - ln -s /usr/local/opt/openssl/lib/libcrypto.dylib /usr/local/lib/ + - ln -s /usr/local/opt/openssl/lib/libssl.dylib /usr/local/lib/ + - ln -s /usr/local/opt/openssl/bin/openssl /usr/local/bin/openssl + - ln -s /usr/local/opt/libiconv/lib/libiconv.dylib /usr/local/lib/ + - ln -s /usr/local/opt/libiconv/lib/libcharset.dylib /usr/local/lib/ + - ln -s /usr/local/opt/libiconv/bin/iconv /usr/local/bin/iconv + - cp /usr/local/opt/libiconv/include/* /usr/local/include/ - brew outdated maven || brew upgrade maven - brew install iproute2mac - brew list --versions - sudo curl https://bootstrap.pypa.io/get-pip.py |sudo python - sudo pip install pycrypto + - sudo pip install cogapp - sudo cpanm install JSON + - sudo mkdir -p /usr/local/opt/hawq-dep + - sudo mkdir -p /usr/local/opt/hawq-dep/bin + - sudo mkdir -p /usr/local/opt/hawq-dep/lib + - sudo mkdir -p /usr/local/opt/hawq-dep/include + - sudo cp -rf /usr/local/opt/openssl/bin/* /usr/local/opt/hawq-dep/bin/ + - sudo cp -rf /usr/local/opt/openssl/lib/* /usr/local/opt/hawq-dep/lib/ + - sudo cp -rf /usr/local/opt/openssl/include/* /usr/local/opt/hawq-dep/include/ + - sudo cp -rf /usr/local/opt/jsoncpp/lib/* /usr/local/opt/hawq-dep/lib/ + - sudo cp -rf /usr/local/opt/jsoncpp/include/* /usr/local/opt/hawq-dep/include/ before_script: - mvn apache-rat:check - - export DEPENDENCY_INSTALL_PREFIX=/usr/local/opt/openssl + - export DEPENDENCY_INSTALL_PREFIX=/usr/local/opt/hawq-dep - cd $TRAVIS_BUILD_DIR - ./configure script: + - sudo install -o $USER -d /usr/local/hawq - make -j$(sysctl -n hw.ncpu) - make feature-test - make feature-test-clean diff --git a/GNUmakefile.in b/GNUmakefile.in index 6e3a476..b69df1b 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -17,13 +17,10 @@ all: $(MAKE) -C depends/libyarn $@ $(MAKE) -C depends/libyarn install $(MAKE) -C depends/dbcommon $@ - $(MAKE) -C depends/dbcommon unittest $(MAKE) -C depends/dbcommon install $(MAKE) -C depends/univplan $@ - $(MAKE) -C depends/univplan unittest $(MAKE) -C depends/univplan install $(MAKE) -C depends/storage $@ - $(MAKE) -C depends/storage unittest $(MAKE) -C depends/storage install $(MAKE) -C src $@ $(MAKE) -C config $@ diff --git a/depends/dbcommon/.gitignore b/depends/dbcommon/.gitignore index a9b913a..aa8125b 100644 --- a/depends/dbcommon/.gitignore +++ b/depends/dbcommon/.gitignore @@ -3,6 +3,7 @@ .project .settings .pydevproject +Makefile.global *.pyc build/ CodeCoverageReport/ diff --git a/depends/storage/.gitignore b/depends/storage/.gitignore index a9b913a..aa8125b 100644 --- a/depends/storage/.gitignore +++ b/depends/storage/.gitignore @@ -3,6 +3,7 @@ .project .settings .pydevproject +Makefile.global *.pyc build/ CodeCoverageReport/ diff --git a/depends/storage/CMake/FindJSON.cmake b/depends/storage/CMake/FindJSON.cmake index 490c80e..a334948 100644 --- a/depends/storage/CMake/FindJSON.cmake +++ b/depends/storage/CMake/FindJSON.cmake @@ -20,7 +20,7 @@ # License text for the above reference.) # Look for the header file. -find_path(JSON_INCLUDE_DIR NAMES jsoncpp/json/json.h) +find_path(JSON_INCLUDE_DIR NAMES json/json.h) mark_as_advanced(JSON_INCLUDE_DIR) # Look for the library (sorted from most current/relevant entry to least). diff --git a/depends/storage/src/storage/format/orc/orc-format-writer.cc b/depends/storage/src/storage/format/orc/orc-format-writer.cc index aadb4b5..c5fd10d 100644 --- a/depends/storage/src/storage/format/orc/orc-format-writer.cc +++ b/depends/storage/src/storage/format/orc/orc-format-writer.cc @@ -21,7 +21,7 @@ #include <utility> #include <vector> -#include "jsoncpp/json/json.h" +#include "json/json.h" // #include "kv/common/cn-global.h" // #include "kv/common/configuration.h" diff --git a/depends/storage/src/storage/format/orc/orc-format.h b/depends/storage/src/storage/format/orc/orc-format.h index 49855c3..6dd3632 100644 --- a/depends/storage/src/storage/format/orc/orc-format.h +++ b/depends/storage/src/storage/format/orc/orc-format.h @@ -24,7 +24,7 @@ #include <string> #include <vector> -#include "jsoncpp/json/json.h" +#include "json/json.h" #include "dbcommon/utils/int-util.h" #include "storage/format/format.h" diff --git a/depends/univplan/.gitignore b/depends/univplan/.gitignore index a9b913a..aa8125b 100644 --- a/depends/univplan/.gitignore +++ b/depends/univplan/.gitignore @@ -3,6 +3,7 @@ .project .settings .pydevproject +Makefile.global *.pyc build/ CodeCoverageReport/