diff options
| author | Howard Chu <hyc@symas.com> | 2019-06-12 15:16:17 +0100 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2019-06-12 16:47:33 +0100 |
| commit | 1dc4ebfd6c9070a66e4617929c3d19d3b8cbe52c (patch) | |
| tree | bb43c117e116b1bf9ae95f46063864b75f220532 | |
| parent | Delete redundant cppzmq dependency (diff) | |
| download | monero-1dc4ebfd6c9070a66e4617929c3d19d3b8cbe52c.tar.xz | |
Use 9 digit build IDs
| -rw-r--r-- | cmake/GenVersion.cmake | 3 | ||||
| -rw-r--r-- | contrib/gitian/gitian-linux.yml | 1 | ||||
| -rw-r--r-- | contrib/gitian/gitian-osx.yml | 1 | ||||
| -rw-r--r-- | contrib/gitian/gitian-win.yml | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/cmake/GenVersion.cmake b/cmake/GenVersion.cmake index 1ea5b209c..b2ccfbc34 100644 --- a/cmake/GenVersion.cmake +++ b/cmake/GenVersion.cmake @@ -29,7 +29,7 @@ # Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers # Check what commit we're on -execute_process(COMMAND "${GIT}" rev-parse --short HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE) +execute_process(COMMAND "${GIT}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE) if(RET) # Something went wrong, set the version tag to -unknown @@ -38,6 +38,7 @@ if(RET) set(VERSIONTAG "unknown") configure_file("src/version.cpp.in" "${TO}") else() + string(SUBSTRING ${COMMIT} 0 9 COMMIT) message(STATUS "You are currently on commit ${COMMIT}") # Get all the tags diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index e851513c4..6e3ad108e 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -129,6 +129,7 @@ script: | chmod +x ${WRAP_DIR}/${prog} done + git config --global core.abbrev 9 cd monero BASEPREFIX=`pwd`/contrib/depends # Build dependencies for each host diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index 6e162f3f6..1cdb85273 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -77,6 +77,7 @@ script: | create_per-host_faketime_wrappers "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} + git config --global core.abbrev 9 cd monero BASEPREFIX=`pwd`/contrib/depends diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index 527aa8ed3..d15383905 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -100,6 +100,7 @@ script: | create_per-host_linker_wrapper "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} + git config --global core.abbrev 9 cd monero BASEPREFIX=`pwd`/contrib/depends # Build dependencies for each host |