diff options
| author | Petteri Aimonen <jpa@github.mail.kapsi.fi> | 2017-09-15 20:24:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 20:24:54 +0300 |
| commit | 8837b48bebc6ab9cc30d89449efc50e4489754ab (patch) | |
| tree | 1ab672db43de502a147b7c91eaddd44dfd14e62a | |
| parent | 4dde8a435e7a59b94750f2acfc43e4d918d2573f (diff) | |
| parent | b9f5fafd7f6a1ce0b4b41e75e8d3793b3190aa61 (diff) | |
Merge pull request #283 from kylemanna/fix-travis
Fix Travis-CI Build
| -rw-r--r-- | .travis.yml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 2e77e7c..e8eca0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ addons: before_install: - export PATH=$HOME/.local/bin:$HOME/protobuf/bin:$PATH - - export MAKEFLAGS=-j$(grep processor /proc/cpuinfo | wc -l) + - export MAKEFLAGS=-j$(nproc) - $CC --version - $CXX --version - python --version @@ -42,13 +42,19 @@ before_install: # directories: # - $HOME/protobuf +# Rather then compile protobuf 3 from source, use the binaries now available +# to speed up build time and reduce surprises until Ubuntu adds protobuf3 +# packages to the repository. install: - - curl -L https://github.com/google/protobuf/releases/download/v3.0.0-beta-1/protobuf-python-3.0.0-alpha-4.tar.gz | tar xzf - - && pushd protobuf-3.0.0-alpha-4 - && ./configure --prefix=$HOME/protobuf && make && make install - && pushd python && python setup.py build && python setup.py install && popd + - mkdir -p $HOME/protobuf && pushd $HOME/protobuf + && curl -LO 'https://github.com/google/protobuf/releases/download/v3.4.0/protoc-3.4.0-linux-x86_64.zip' + && unzip protoc-3.4.0-linux-x86_64.zip + && popd + - curl -L 'https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-python-3.4.0.tar.gz' | tar xzf - + && pushd protobuf-3.4.0/python + && python setup.py build && python setup.py install && popd script: - pushd generator/proto && make && popd - - pushd tests && python2 $(which scons) CC=$CC CXX=$CXX && popd + - pushd tests && scons CC=$CC CXX=$CXX && popd |