LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

repair failed format, bump travis images

Browse source 
build experiment 2


build experiment 3


build experiment 4


Replace flattenTrie by callback

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>

Use interruption point instead of boolean condition

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>

Add ability to earlier exit in rpc methods getclaimtrie and getclaimsintrie

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>

simplified early exit handling


ran formatter


check out the whole repo on Travis (for formatter)


origin should be there
This commit is contained in:
Brannon King 2018-12-14 11:06:10 +01:00
parent 02986f766c
commit a25334c150
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -2,17 +2,17 @@ matrix:
include: include:
- os: linux - os: linux
sudo: required sudo: required
dist: trusty dist: xenial
language: c language: c
env: TARGET=linux env: TARGET=linux
- os: linux - os: linux
sudo: required sudo: required
dist: trusty dist: xenial
language: c language: c
env: TARGET=windows env: TARGET=windows
- os: osx - os: osx
language: c language: c
osx_image: xcode7.3 osx_image: xcode8.3
env: TARGET=osx env: TARGET=osx
cache: cache:
apt: true apt: true
@ -20,11 +20,12 @@ cache:
directories: directories:
- build - build
- depends/built - depends/built
git:
depth: false
before_install: before_install:
- date +%s > "${TRAVIS_BUILD_DIR}/start_time" - date +%s > "${TRAVIS_BUILD_DIR}/start_time"
- ls -lh build - ls -lh build
- du -h -d 2 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 brew install ccache; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
install: true install: true

10
reproducible_build.sh
View file

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