From cd7c2961dc7182016f7e9eddba2497d0a0b5d6cd Mon Sep 17 00:00:00 2001 From: Brannon King Date: Thu, 15 Apr 2021 10:13:33 -0400 Subject: [PATCH] rolling version --- .travis.yml | 16 +++++++++------- configure.ac | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index e46781e58..71c326411 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ jobs: - &build-template stage: build name: linux - env: NAME=linux EXT= + env: NAME=linux DOCKER_IMAGE=lbry/build_lbrycrd_gcc EXT= os: linux dist: xenial language: minimal @@ -22,8 +22,9 @@ jobs: - docker install: - mkdir -p ${HOME}/ccache - - docker pull $DOCKER_BUILD_IMAGE + - docker pull $DOCKER_IMAGE script: + - echo "build..." - docker run -v "$(pwd):/lbrycrd" -v "${HOME}/ccache:/ccache" -w /lbrycrd -e CCACHE_DIR=/ccache ${DOCKER_IMAGE} packaging/build_${NAME}_64bit.sh before_deploy: - mkdir -p dist @@ -47,11 +48,11 @@ jobs: - <<: *build-template name: windows - env: NAME=windows EXT=.exe + env: NAME=windows DOCKER_IMAGE=lbry/build_lbrycrd EXT=.exe - <<: *build-template name: osx - env: NAME=darwin EXT= + env: NAME=darwin DOCKER_IMAGE=lbry/build_lbrycrd EXT= before_install: - mkdir -p ./depends/SDKs && pushd depends/SDKs && curl -C - ${MAC_OS_SDK} | tar --skip-old-files -xJ && popd @@ -62,7 +63,7 @@ jobs: dist: xenial language: minimal git: - depth: 3 + clone: false install: - mkdir -p testrun && cd testrun - curl http://build.lbry.io/lbrycrd/${TRAVIS_BRANCH}/lbrycrd-${NAME}-test.zip -o temp.zip @@ -77,10 +78,11 @@ jobs: services: - docker script: - - docker pull $DOCKER_WINE_IMAGE - - docker run -v "$(pwd):/test" -e "WINEDEBUG=-all" -e "TRIEHASH_FUZZER_BLOCKS=1000" -it $DOCKER_WINE_IMAGE wine "/test/test_lbrycrd.exe" + - docker pull lbry/wine + - docker run -v "$(pwd):/test" -e "WINEDEBUG=-all" -e "TRIEHASH_FUZZER_BLOCKS=1000" -it lbry/wine wine "/test/test_lbrycrd.exe" - <<: *test-template os: osx osx_image: xcode8.3 env: NAME=darwin + diff --git a/configure.ac b/configure.ac index 255c7e9d2..1daad77fc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,9 +3,9 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 17) define(_CLIENT_VERSION_REVISION, 3) -define(_CLIENT_VERSION_BUILD, 2) +define(_CLIENT_VERSION_BUILD, 3) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2019) +define(_COPYRIGHT_YEAR, 2021) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[LBRYcrd Core]]) AC_INIT([LBRYcrd Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/lbryio/lbrycrd/issues],[lbrycrd],[https://lbry.com/])