Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: buckaroo-pm/boost-algorithm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 16a1f527f05f7de995557a3e1c18defde5e86251
Choose a base ref
..
head repository: buckaroo-pm/boost-algorithm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1abc567ab426fe9af95560504a207547d6e11040
Choose a head ref
Showing with 60 additions and 162 deletions.
  1. +22 −161 .travis.yml
  2. +5 −1 buckaroo.lock.toml
  3. +18 −0 travis/before-install-linux.sh
  4. +15 −0 travis/before-install-osx.sh
183 changes: 22 additions & 161 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,171 +1,32 @@
# Copyright 2016, 2017, 2018 Peter Dimov
# Copyright 2018 T. Zachary Laine
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)

language: cpp
sudo: true
dist: trusty

sudo: false
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
- gcc-6

branches:
only:
- master
- develop
- /feature\/.*/
os:
- linux
- osx

env:
matrix:
- BOGUS_JOB=true

matrix:

exclude:
- env: BOGUS_JOB=true

include:
- os: linux
env: TOOLSET=gcc COMPILER=g++ CXXSTD=11

- os: linux
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=11
addons:
apt:
packages:
- g++-4.7
sources:
- ubuntu-toolchain-r-test

- os: linux
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=11
addons:
apt:
packages:
- g++-4.8
sources:
- ubuntu-toolchain-r-test

- os: linux
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=11
addons:
apt:
packages:
- g++-4.9
sources:
- ubuntu-toolchain-r-test

- os: linux
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=11,14,1z
addons:
apt:
packages:
- g++-5
sources:
- ubuntu-toolchain-r-test

- os: linux
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=11,14,1z
addons:
apt:
packages:
- g++-6
sources:
- ubuntu-toolchain-r-test

- os: linux
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=11,14,1z CXXSTD_DIALECT=cxxstd-dialect=gnu
addons:
apt:
packages:
- g++-6
sources:
- ubuntu-toolchain-r-test

- os: linux
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=11,14,17
addons:
apt:
packages:
- g++-7
sources:
- ubuntu-toolchain-r-test

- os: linux
env: TOOLSET=clang COMPILER=clang++ CXXSTD=11

- os: linux
compiler: clang++-libc++
env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=11,14,1z
addons:
apt:
packages:
- libc++-dev

- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z
osx_image: xcode9.1

- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z
osx_image: xcode9

- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z
osx_image: xcode8.3
- BUCKAROO_VERSION=v2.0.0

- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z
osx_image: xcode8
cache:
directories:
- $HOME/.buckaroo/cache
- $TRAVIS_BUILD_DIR/bin

- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z
osx_image: xcode7.3
osx_image: xcode9.3

- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z
osx_image: xcode6.4
before_install:
- ./travis/before-install-$TRAVIS_OS_NAME.sh

install:
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
- cd ..
- git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule update --init tools/build
- git submodule update --init libs/config
- git submodule update --init libs/predef
- git submodule update --init libs/core
- git submodule update --init libs/detail
- git submodule update --init libs/range
- git submodule update --init libs/assert
- git submodule update --init libs/array
- git submodule update --init libs/type_traits
- git submodule update --init libs/static_assert
- git submodule update --init libs/iterator
- git submodule update --init libs/preprocessor
- git submodule update --init libs/mpl
- git submodule update --init libs/smart_ptr
- git submodule update --init libs/callable_traits
- git submodule update --init libs/type_index
- git submodule update --init libs/exception
- git submodule update --init libs/throw_exception
- git submodule update --init libs/utility
- git submodule update --init libs/bind
- git submodule update --init libs/ratio
- git submodule update --init libs/function
- git submodule update --init libs/integer
- git submodule update --init libs/numeric
- git submodule update --init libs/move
- git submodule update --init libs/container_hash
- git submodule update --init libs/io
- git submodule update --init libs/concept_check
- git submodule update --init libs/test
- git submodule update --init libs/timer
- git submodule update --init libs/chrono
- git submodule update --init libs/system
- cp -r $TRAVIS_BUILD_DIR/* libs/algorithm
- ./bootstrap.sh
- ./b2 headers

script:
- |-
echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
- ./b2 -j3 libs/algorithm/test toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT
- ./bin/buckaroo install
- ./bin/buck build -c ui.superconsole=DISABLED //:algorithm
6 changes: 5 additions & 1 deletion buckaroo.lock.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
manifest = "cafbd71363716348db44fd86189219446469c8c0db36491c8f1536735e3c88bd"
manifest = "d8ff67b4b0b141aa3ffab8f808794f824c08511e28381486957b4fdd771bf063"

[[dependency]]
package = "github.com/buckaroo-pm/boost-array"
@@ -184,6 +184,10 @@ revision = "5548bd44b949ccd04331c4fb25b0bb3c9b0db0d8"
versions = [ "branch=master" ]
revision = "1ac6205cc64073c8142265daad63a7d734ead36e"

[lock."github.com/buckaroo-pm/boost-type_index"]
versions = [ "branch=master" ]
revision = "1ac6205cc64073c8142265daad63a7d734ead36e"

[lock."github.com/buckaroo-pm/boost-type_traits"]
versions = [ "branch=master" ]
revision = "4d0a507c0d1a1011c5a98d57acc9f6b755141e4f"
18 changes: 18 additions & 0 deletions travis/before-install-linux.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 90

c++ --version
g++ --version
gcc --version

mkdir -p bin

wget -c https://github.com/njlr/buck-warp/releases/download/v0.2.0/buck-2019.01.10.01-linux -O bin/buck
chmod +x ./bin/buck
./bin/buck --version

wget -c https://github.com/LoopPerfect/buckaroo/releases/download/$BUCKAROO_VERSION/buckaroo-linux -O bin/buckaroo
chmod +x ./bin/buckaroo
./bin/buckaroo version
15 changes: 15 additions & 0 deletions travis/before-install-osx.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

c++ --version
g++ --version
gcc --version

mkdir -p bin

wget -c https://github.com/njlr/buck-warp/releases/download/v0.2.0/buck-2019.01.10.01-osx -O bin/buck
chmod +x ./bin/buck
./bin/buck --version

wget -c https://github.com/LoopPerfect/buckaroo/releases/download/$BUCKAROO_VERSION/buckaroo-macos -O bin/buckaroo
chmod +x ./bin/buckaroo
./bin/buckaroo version