From 18136c8b7e8f65abfc2c5ce2591ccf4b87afbd6a Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Wed, 16 Jan 2019 17:37:11 +0100 Subject: [PATCH] ci: fix grafted commmit in shallow clone travis does a shallow clone, and the reference commit was grafted (too old). Move it to a more recent one. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57d94440..ffef6f10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ addons: install: - pip install --user urllib3[secure] - - pip install --user cpp-coveralls + - pip install --user cpp-coveralls - cd contrib - tar xfv astyle_3.0_linux.tar.gz; cd astyle/build/gcc && make; @@ -53,8 +53,8 @@ before_script: - cd $TRAVIS_BUILD_DIR - if astyle --style=kr --indent-switches --indent-labels --pad-oper --pad-header --align-pointer=name --add-braces --convert-tabs --max-code-length=90 --break-after-logical --suffix=none *.c *.h --recursive --exclude=contrib --exclude=src/yajl --exclude=src/secp256k1 --exclude=tests/windows/hidapi --exclude=src/drivers --dry-run -Q | grep "Formatted" ; then exit 1 ; fi; - gpg --import contrib/contributors_gpg_keys/* - - if ! git show 6b6c1a3d388d57e140b9c983a64507e3238ed4e3; then exit 1 ; fi; - - if git log --pretty="format:%H %aN %s %G?" 6b6c1a3d388d57e140b9c983a64507e3238ed4e3..HEAD^1 | grep -v "${t} G$" | grep -v "${t} U$"; then exit 1 ; fi; + - if ! git show c6ce843547c5212e33665dd4ca7c951a43067044; then exit 1 ; fi; + - if git log --pretty="format:%H %aN %s %G?" c6ce843547c5212e33665dd4ca7c951a43067044..HEAD^1 | grep -v "${t} G$" | grep -v "${t} U$"; then exit 1 ; fi; script: - mkdir build && cd build