From cbb6acd75c25fd48f8b3f83c414166beb3c828e2 Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Mon, 8 Aug 2016 10:02:46 -0500 Subject: [PATCH 1/3] travis fix: only output last 1000 lines on error --- reproducible_build.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/reproducible_build.sh b/reproducible_build.sh index f47a3d88f..992298a01 100755 --- a/reproducible_build.sh +++ b/reproducible_build.sh @@ -31,6 +31,9 @@ BUILD_DEPENDENCIES=true BUILD_LBRYCRD=true TIMEOUT=false THREE_MB=3145728 +# this flag gets set to False if +# the script exits due to a timeout +OUTPUT_LOG=true while getopts :crldoth:w:d: FLAG; do case $FLAG in @@ -116,6 +119,7 @@ function exit_at_45() { fi if [ "$TIMEOUT" = true ] && (( TIME > TIMEOUT_SECS )); then echo 'Exiting at 45 minutes to allow the cache to populate' + OUTPUT_LOG=false exit 1 fi fi @@ -159,11 +163,11 @@ function background() { function cleanup() { rv=$? # cat the log file if it exists - if [ -f "$2" ]; then + if [ -f "$2" ] && [ "${OUTPUT_LOG}" = true ]; then echo echo "Output of log file $2" echo - tail -c $THREE_MB "$1" + tail -n 1000 "$2" echo fi # delete the build directory @@ -175,14 +179,15 @@ function cleanup() { function cat_and_exit() { rv=$? # cat the log file if it exists - if [ -f "$1" ]; then + if [ -f "$1" ] && [ "${OUTPUT_LOG}" = true ]; then echo echo "Output of log file $1" echo - # log size is limited to 4MB on travis - # so hopefully the last 3MB is enough + # This used to be the last 3MB but outputing that + # caused problems on travis. + # Hopefully the last 1000 lines is enough # to debug whatever went wrong - tail -c $THREE_MB "$1" + tail -n 1000 "$1" echo fi exit $rv -- 2.45.3 From 083a4a1b88359a6b0ecf2162e794aa2cf0ca9388 Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Mon, 8 Aug 2016 10:58:58 -0500 Subject: [PATCH 2/3] Change build timeout to 40 minutes --- reproducible_build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reproducible_build.sh b/reproducible_build.sh index 992298a01..44c4bfcd0 100755 --- a/reproducible_build.sh +++ b/reproducible_build.sh @@ -19,7 +19,7 @@ function HELP { echo "-r: remove intermediate files." echo "-l: build only lbrycrd" echo "-d: build only the dependencies" - echo "-o: timeout build after 45 minutes" + echo "-o: timeout build after 40 minutes" echo "-t: turn trace on" echo "-h: show help" exit 1 @@ -107,18 +107,18 @@ fi NEXT_TIME=60 -function exit_at_45() { +function exit_at_40() { if [ -f "${START_TIME_FILE}" ]; then NOW=$(date +%s) START=$(cat "${START_TIME_FILE}") - TIMEOUT_SECS=2700 # 45 * 60 + TIMEOUT_SECS=2400 # 40 * 60 TIME=$((NOW - START)) if (( TIME > NEXT_TIME )); then echo "Build has taken $((TIME / 60)) minutes: $1" NEXT_TIME=$((TIME + 60)) fi if [ "$TIMEOUT" = true ] && (( TIME > TIMEOUT_SECS )); then - echo 'Exiting at 45 minutes to allow the cache to populate' + echo 'Exiting at 40 minutes to allow the cache to populate' OUTPUT_LOG=false exit 1 fi @@ -140,7 +140,7 @@ function wait_and_echo() { # loop until the process is no longer running # check every $SLEEP seconds, echoing a message every minute while (ps -p "${PID}" > /dev/null); do - exit_at_45 "$2" + exit_at_40 "$2" sleep "${SLEEP}" done # restore the xtrace setting -- 2.45.3 From e4481fc213a56999621b4525f0ae8fd74f38bbda Mon Sep 17 00:00:00 2001 From: kkurokawa Date: Mon, 8 Aug 2016 19:12:30 -0400 Subject: [PATCH 3/3] update version --- src/clientversion.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/clientversion.h b/src/clientversion.h index 6f255d69c..b4be03aeb 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -16,8 +16,8 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 -#define CLIENT_VERSION_REVISION 99 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_REVISION 0 +#define CLIENT_VERSION_BUILD 1 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE false -- 2.45.3