Skip to content

Commit

Permalink
Merge 06d3c1c into 9cf5559
Browse files Browse the repository at this point in the history
  • Loading branch information
crackedmind authored Oct 26, 2018
2 parents 9cf5559 + 06d3c1c commit 6a2a762
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis/os_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -x

if [ "$TRAVIS_OS_NAME" == "linux" ]; then
docker run --rm -v $PWD:/repo -v ~/.travis:/travis berkus/docker-cpp-ci /bin/sh -c "cd /repo/_build_; conan install .. --build missing; /repo/.travis/build.sh" || exit 1
docker run --rm -v $PWD:/repo -v ~/.travis:/travis procpp/docker-cpp-ci /bin/sh -c "cd /repo/_build_; conan install .. --build missing; /repo/.travis/build.sh" || exit 1
fi

if [ "$TRAVIS_OS_NAME" == "osx" ]; then
Expand Down
2 changes: 1 addition & 1 deletion .travis/os_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -x

if [ "$TRAVIS_OS_NAME" == "linux" ]; then
docker pull berkus/docker-cpp-ci:latest || exit 1
docker pull procpp/docker-cpp-ci:latest || exit 1
fi

brew_package() {
Expand Down

0 comments on commit 6a2a762

Please sign in to comment.