repair failed format, bump travis images

build experiment 2 build experiment 3 build experiment 4 Replace flattenTrie by callback Signed-off-by: Anthony Fieroni <[email protected]> Use interruption point instead of boolean condition Signed-off-by: Anthony Fieroni <[email protected]> Add ability to earlier exit in rpc methods getclaimtrie and getclaimsintrie Signed-off-by: Anthony Fieroni <[email protected]> simplified early exit handling ran formatter check out the whole repo on Travis (for formatter) origin should be there
lbryio · Dec 14, 2018 · a25334c · a25334c
1 parent 02986f7
commit a25334c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,29 +2,30 @@ matrix:
   include:
   - os: linux
     sudo: required
-    dist: trusty
+    dist: xenial
     language: c
     env: TARGET=linux
   - os: linux
     sudo: required
-    dist: trusty
+    dist: xenial
     language: c
     env: TARGET=windows
   - os: osx
     language: c
-    osx_image: xcode7.3
+    osx_image: xcode8.3
     env: TARGET=osx
 cache:
   apt: true
   ccache: true
   directories:
   - build
   - depends/built
+git:
+  depth: false
 before_install:
 - date +%s > "${TRAVIS_BUILD_DIR}/start_time"
 - ls -lh build
 - du -h -d 2 build
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ccache; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
 install: true

diff --git a/reproducible_build.sh b/reproducible_build.sh
@@ -237,7 +237,7 @@ function install_apt_packages() {
 
     if [ "${CHECK_CODE_FORMAT}" = true ]; then
         $SUDO apt-get ${QUIET} install -y --no-install-recommends \
-            clang-format-3.4
+            clang-format-3.9
     fi
 
 }
@@ -327,6 +327,7 @@ function build_libevent() {
 }
 
 function build_dependency() {
+    pushd .
     PREFIX=$1
     LOG=$2
     BUILD=$3
@@ -337,6 +338,7 @@ function build_dependency() {
 	"${BUILD}" "${LOG}"
 	trap - INT TERM EXIT
     fi
+    popd
 }
 
 function build_lbrycrd() {
@@ -370,11 +372,7 @@ function build_lbrycrd() {
 function clang_format_diff(){
     # run a code formatting check on any commits not in master
     # requires clang-format
-    if ! git config remote.origin2.url > /dev/null; then
-        git remote add origin2 https://github.com/lbryio/lbrycrd.git
-    fi
-    git fetch origin2
-    git diff -U0 origin2/master -- '*.h' '*.cpp' | ./contrib/devtools/clang-format-diff.py -p1
+    git diff -U0 origin/master -- '*.h' '*.cpp' | ./contrib/devtools/clang-format-diff.py -p1
 }
 
 # these variables are needed in both functions