diff --git a/.travis.yml b/.travis.yml index 07d671d95..e9773d4e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -sudo: false branches: only: - /master.*/ @@ -7,35 +6,20 @@ branches: language: cpp script: - pushd src/engine + - export CXX=${TRAVIS_COMPILER} - ./build.sh ${TOOLSET} - popd - pushd test - python test_all.py ${TOOLSET} - popd + - src/engine/b2 --prefix=${HOME}/b2 install + - ls -laFR ${HOME}/b2 stages: - name: test - name: website update if: branch IN (develop,master) AND type IN (push) jobs: include: - - env: TOOLSET=gcc - os: linux - compiler: g++-4.4 - addons: - apt: - packages: - - g++-4.4 - sources: - - ubuntu-toolchain-r-test - - env: TOOLSET=gcc - os: linux - compiler: g++-4.6 - addons: - apt: - packages: - - g++-4.6 - sources: - - ubuntu-toolchain-r-test - env: TOOLSET=gcc os: linux compiler: g++-4.7 @@ -209,30 +193,39 @@ jobs: - os: osx osx_image: xcode10 env: TOOLSET=clang + compiler: clang - os: osx osx_image: xcode9.4 env: TOOLSET=clang + compiler: clang - os: osx osx_image: xcode9.3 env: TOOLSET=clang + compiler: clang - os: osx osx_image: xcode9.2 env: TOOLSET=clang + compiler: clang - os: osx osx_image: xcode9.1 env: TOOLSET=clang + compiler: clang - os: osx osx_image: xcode9 env: TOOLSET=clang + compiler: clang - os: osx osx_image: xcode8.3 env: TOOLSET=clang + compiler: clang - os: osx osx_image: xcode8 env: TOOLSET=clang + compiler: clang - os: osx osx_image: xcode7.3 env: TOOLSET=clang + compiler: clang - stage: website update os: linux script: @@ -248,4 +241,4 @@ jobs: - popd - ./bootstrap.sh --with-toolset=${TOOLSET} - pushd doc - - ../b2 --website-doc-dir=manual/${TRAVIS_BRANCH} website + - ../b2 --website-doc-dir=manual/${TRAVIS_BRANCH} website \ No newline at end of file