diff options
| author | John Wiegley <johnw@newartisans.com> | 2018-07-19 22:42:41 -0700 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2018-07-19 22:42:41 -0700 |
| commit | 2d8e2fd0396deb02904a9641d89a4c137f71e597 (patch) | |
| tree | 07edb71c71af029cc28bedcf32f9e13237d2f2e1 /.travis.yml | |
| parent | 5d02402291a923d30e66e4b0a08975ebf22361c3 (diff) | |
| download | fork-ledger-2d8e2fd0396deb02904a9641d89a4c137f71e597.tar.gz fork-ledger-2d8e2fd0396deb02904a9641d89a4c137f71e597.tar.bz2 fork-ledger-2d8e2fd0396deb02904a9641d89a4c137f71e597.zip | |
Correct to Travis build for the new master branch version
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 94489bdc..cbb910b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,8 @@ addons: #- libboost-serialization1.55-dev before_install: - - if [ "${TRAVIS_BRANCH}" = "master" ]; then export BOOST_VERSION="${BOOST_VERSION_MIN}"; else export BOOST_VERSION="${BOOST_VERSION_MAX}"; fi + # - if [ "${TRAVIS_BRANCH}" = "master" ]; then export BOOST_VERSION="${BOOST_VERSION_MIN}"; else export BOOST_VERSION="${BOOST_VERSION_MAX}"; fi + - BOOST_VERSION="${BOOST_VERSION_MAX}" - if [ -n "${BOOST_VERSION}" ]; then export BOOST_ROOT="${TRAVIS_BUILD_DIR}/../boost-trunk"; export CMAKE_MODULE_PATH="${BOOST_ROOT}"; fi - if [ "${CXX}" = "g++" ]; then export CXX="$(which g++-4.8)"; export CC="$(which gcc-4.8)"; fi - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then export DYLD_LIBRARY_PATH="${BOOST_ROOT}/lib"; fi |