Permalink
Browse files

Clang 6.0 (#98)

*  - renamed folder docker/manylinux -> docker/manylinux-builder

*  - using clang-format-6.0

*  - making use of update-alternatives, instead of link

*  - exposed TRAVIS* env vars to coveralls
 - removed use of COVERALLS_REPO_TOKEN, as it's not needed on Travis-CI
  • Loading branch information...
narekgharibyan committed Sep 6, 2018
1 parent 1980a4f commit ea121d3f39a6191bb36fa7ffb8a4514a792d2c00
@@ -104,7 +104,7 @@ script:
- if [ "$BUILD_TYPE" == "rust" ]; then docker run --rm -v `pwd`:/io $DOCKER_IMAGE /io/travis/build_rust.sh ; fi
- if [ "$BUILD_TYPE" == "coverage" ] && [ "$TRAVIS_REPO_SLUG" == "$GITHUB_REPO" ]; then
docker run --rm -v `pwd`:/io -e TRAVIS_JOB_ID -e COVERALLS_REPO_TOKEN $DOCKER_IMAGE /io/travis/coverage.sh ; fi
docker run --rm -v `pwd`:/io -e TRAVIS -e TRAVIS_JOB_ID -e TRAVIS_BRANCH -e TRAVIS_PULL_REQUEST $DOCKER_IMAGE /io/travis/coverage.sh ; fi
- if [ "$BUILD_TYPE" == "doc" ] && [ "$TRAVIS_REPO_SLUG" == "$GITHUB_REPO" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
source ./travis/build_doc.sh ; fi
@@ -11,9 +11,11 @@ RUN set -ex \
# install packages required by keyvi
RUN set -ex \
&& apt-get update \
&& apt-get install -y cmake g++ libboost-all-dev libsnappy-dev libzzip-dev zlib1g-dev clang clang-format doxygen \
&& apt-get install -y cmake g++ libboost-all-dev libsnappy-dev libzzip-dev zlib1g-dev clang clang-format-6.0 doxygen \
&& rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 1000
# install pyenv
RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
ENV PATH "/root/.pyenv/shims/:/root/.pyenv/bin:$PATH"
@@ -35,6 +35,4 @@ coveralls -r . -b python/ -i python \
# workaround: remove 'python' from source path before merge
sed s/"python\/src\/cpp\/keyvi"/"keyvi"/g python.cov_report_tmp > python.cov_report
export COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN}
coveralls-merge keyvi.cov_report python.cov_report

0 comments on commit ea121d3

Please sign in to comment.