diff --git a/.gitignore b/.gitignore index 8b9d8baa8..6f8ea365b 100644 --- a/.gitignore +++ b/.gitignore @@ -57,7 +57,7 @@ src/univalue/gen *.pb.cc *.pb.h .vscode - +*.in *.log *.trs *.dmg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8cb850ec7..3e81ec55a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: ####START#### PROJECT LEVEL VARIABLES ####START#### ######################################################################################################################## variables: - VERSION: 0.6.0-9-PBaaS-Cross-chain-Technology-Preview + VERSION: 0.6.0-10-PBaaS-Cross-chain-Technology-Preview VERUS_CLI_LINUX: Verus-CLI-Linux-v${VERSION}.tar.gz VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip VERUS_CLI_MACOS: Verus-CLI-MacOS-v${VERSION}.tar.gz @@ -53,6 +53,7 @@ build:linux: - chmod +x verus-cli/fetch-params - tar -czvf ${VERUS_CLI_LINUX} verus-cli - sha256sum ${VERUS_CLI_LINUX} > ${VERUS_CLI_LINUX}.sha256 + - git status after_script: - curl -F file=@"${VERUS_CLI_LINUX}" -F channels="${CLI_POST_CHANNEL}" diff --git a/configure.ac b/configure.ac index 73395bb68..0a13bde9e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 6) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 8) +define(_CLIENT_VERSION_BUILD, 9) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/src/clientversion.h b/src/clientversion.h index e1ae3895b..a83997a36 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 6 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 8 +#define CLIENT_VERSION_BUILD 9 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/cryptoconditions/.gitignore b/src/cryptoconditions/.gitignore index 1d84f2618..c5e60d14c 100644 --- a/src/cryptoconditions/.gitignore +++ b/src/cryptoconditions/.gitignore @@ -19,6 +19,7 @@ *.l[ao] *.[ao] *~ +*.in converter-sample.c config.* .pytest_cache