nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 9 digit build IDs

Browse Source
This commit is contained in:
Howard Chu 2019-06-12 15:16:17 +01:00
parent 01ced20eca
commit 1dc4ebfd6c
No known key found for this signature in database
GPG Key ID: FD2A70B44AB11BA7
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/GenVersion.cmake
View File

@ -29,7 +29,7 @@
# Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers # Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
# Check what commit we're on # 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) if(RET)
# Something went wrong, set the version tag to -unknown # Something went wrong, set the version tag to -unknown
@ -38,6 +38,7 @@ if(RET)
set(VERSIONTAG "unknown") set(VERSIONTAG "unknown")
configure_file("src/version.cpp.in" "${TO}") configure_file("src/version.cpp.in" "${TO}")
else() else()
string(SUBSTRING ${COMMIT} 0 9 COMMIT)
message(STATUS "You are currently on commit ${COMMIT}") message(STATUS "You are currently on commit ${COMMIT}")
# Get all the tags # Get all the tags

1
contrib/gitian/gitian-linux.yml
View File

@ -129,6 +129,7 @@ script: |
chmod +x ${WRAP_DIR}/${prog} chmod +x ${WRAP_DIR}/${prog}
done done
git config --global core.abbrev 9
cd monero cd monero
BASEPREFIX=`pwd`/contrib/depends BASEPREFIX=`pwd`/contrib/depends
# Build dependencies for each host # Build dependencies for each host

1
contrib/gitian/gitian-osx.yml
View File

@ -77,6 +77,7 @@ script: |
create_per-host_faketime_wrappers "2000-01-01 12:00:00" create_per-host_faketime_wrappers "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH} export PATH=${WRAP_DIR}:${PATH}
git config --global core.abbrev 9
cd monero cd monero
BASEPREFIX=`pwd`/contrib/depends BASEPREFIX=`pwd`/contrib/depends

1
contrib/gitian/gitian-win.yml
View File

@ -100,6 +100,7 @@ script: |
create_per-host_linker_wrapper "2000-01-01 12:00:00" create_per-host_linker_wrapper "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH} export PATH=${WRAP_DIR}:${PATH}
git config --global core.abbrev 9
cd monero cd monero
BASEPREFIX=`pwd`/contrib/depends BASEPREFIX=`pwd`/contrib/depends
# Build dependencies for each host # Build dependencies for each host