diff --git a/reproducible_build.sh b/reproducible_build.sh index 44c4bfcd0..f47a3d88f 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 40 minutes" + echo "-o: timeout build after 45 minutes" echo "-t: turn trace on" echo "-h: show help" exit 1 @@ -31,9 +31,6 @@ 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 @@ -107,19 +104,18 @@ fi NEXT_TIME=60 -function exit_at_40() { +function exit_at_45() { if [ -f "${START_TIME_FILE}" ]; then NOW=$(date +%s) START=$(cat "${START_TIME_FILE}") - TIMEOUT_SECS=2400 # 40 * 60 + TIMEOUT_SECS=2700 # 45 * 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 40 minutes to allow the cache to populate' - OUTPUT_LOG=false + echo 'Exiting at 45 minutes to allow the cache to populate' exit 1 fi fi @@ -140,7 +136,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_40 "$2" + exit_at_45 "$2" sleep "${SLEEP}" done # restore the xtrace setting @@ -163,11 +159,11 @@ function background() { function cleanup() { rv=$? # cat the log file if it exists - if [ -f "$2" ] && [ "${OUTPUT_LOG}" = true ]; then + if [ -f "$2" ]; then echo echo "Output of log file $2" echo - tail -n 1000 "$2" + tail -c $THREE_MB "$1" echo fi # delete the build directory @@ -179,15 +175,14 @@ function cleanup() { function cat_and_exit() { rv=$? # cat the log file if it exists - if [ -f "$1" ] && [ "${OUTPUT_LOG}" = true ]; then + if [ -f "$1" ]; then echo echo "Output of log file $1" echo - # This used to be the last 3MB but outputing that - # caused problems on travis. - # Hopefully the last 1000 lines is enough + # log size is limited to 4MB on travis + # so hopefully the last 3MB is enough # to debug whatever went wrong - tail -n 1000 "$1" + tail -c $THREE_MB "$1" echo fi exit $rv 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