Gitian: Add version string to output tar archives
The tar archives generated by gitian are currently unversioned. This adds either a tag name when building from a tag, or a short commit id when building from a commit hash.
This commit is contained in:
parent
6335509727
commit
9a5933f705
|
@ -131,6 +131,13 @@ script: |
|
||||||
|
|
||||||
git config --global core.abbrev 9
|
git config --global core.abbrev 9
|
||||||
cd monero
|
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
|
BASEPREFIX=`pwd`/contrib/depends
|
||||||
# Build dependencies for each host
|
# Build dependencies for each host
|
||||||
for i in $HOSTS; do
|
for i in $HOSTS; do
|
||||||
|
@ -155,9 +162,10 @@ script: |
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON
|
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
DISTNAME=monero-${i}
|
DISTNAME=monero-${i}-${version}
|
||||||
mv bin ${DISTNAME}
|
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
|
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 ..
|
cd ..
|
||||||
rm -rf build
|
rm -rf build
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -79,6 +79,13 @@ script: |
|
||||||
|
|
||||||
git config --global core.abbrev 9
|
git config --global core.abbrev 9
|
||||||
cd monero
|
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
|
BASEPREFIX=`pwd`/contrib/depends
|
||||||
|
|
||||||
mkdir -p ${BASEPREFIX}/SDKs
|
mkdir -p ${BASEPREFIX}/SDKs
|
||||||
|
@ -102,7 +109,7 @@ script: |
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake
|
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
DISTNAME=monero-${i}
|
DISTNAME=monero-${i}-${version}
|
||||||
mv bin ${DISTNAME}
|
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
|
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 ..
|
cd ..
|
||||||
|
|
|
@ -102,6 +102,13 @@ script: |
|
||||||
|
|
||||||
git config --global core.abbrev 9
|
git config --global core.abbrev 9
|
||||||
cd monero
|
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
|
BASEPREFIX=`pwd`/contrib/depends
|
||||||
# Build dependencies for each host
|
# Build dependencies for each host
|
||||||
for i in $HOSTS; do
|
for i in $HOSTS; do
|
||||||
|
@ -127,7 +134,7 @@ script: |
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake
|
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
DISTNAME=monero-${i}
|
DISTNAME=monero-${i}-${version}
|
||||||
mv bin ${DISTNAME}
|
mv bin ${DISTNAME}
|
||||||
find ${DISTNAME}/ | sort | zip -X@ ${OUTDIR}/${DISTNAME}.zip
|
find ${DISTNAME}/ | sort | zip -X@ ${OUTDIR}/${DISTNAME}.zip
|
||||||
cd .. && rm -rf build
|
cd .. && rm -rf build
|
||||||
|
|
Loading…
Reference in New Issue