diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-08-19 17:16:02 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-08-19 17:16:02 -0500 |
| commit | b7415d3a5c6252224ebb44d0143b698b13937d87 (patch) | |
| tree | 7cea2758fad4128cea1a89d71ddc55fa138fb3db /contrib/gitian/gitian-osx.yml | |
| parent | Merge pull request #5705 (diff) | |
| parent | Gitian: Add version string to output tar archives (diff) | |
| download | monero-b7415d3a5c6252224ebb44d0143b698b13937d87.tar.xz | |
Merge pull request #5706
9a5933f Gitian: Add version string to output tar archives (TheCharlatan)
Diffstat (limited to 'contrib/gitian/gitian-osx.yml')
| -rw-r--r-- | contrib/gitian/gitian-osx.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index 1cdb85273..77ea30072 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -79,6 +79,13 @@ script: | git config --global core.abbrev 9 cd monero + # Set the version string that gets added to the tar archive name + version="`git describe`" + if [[ $version == *"-"*"-"* ]]; then + version="`git rev-parse --short=9 HEAD`" + version="`echo $version | head -c 9`" + fi + BASEPREFIX=`pwd`/contrib/depends mkdir -p ${BASEPREFIX}/SDKs @@ -102,7 +109,7 @@ script: | mkdir build && cd build cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake make ${MAKEOPTS} - DISTNAME=monero-${i} + DISTNAME=monero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}.tar.gz cd .. |