cd $WORKSPACE/geode
-# Get most recent tag that is reachable from a commit
-GEODE_VERSION=$(git describe --abbrev=0 | sed -r "s#rel/v(.*)#\1#")
+# Get most recent tag that is reachable from a commit on current branch
+GEODE_VERSION=$(git describe --abbrev=0 --tags | sed -r "s#rel/v(.*)#\1#")
BUILD_DATE=$(date '+%Y%m%d%H%M')
if [ ! -d ${WORKSPACE}/geode-build-version ] ; then
mkdir ${WORKSPACE}/geode-build-version
fi
-# Make sure the Geode tag version is in agreed fromat: \d.\d.\d.[ \d or RC\d ]
-if [[ ${GEODE_VERSION} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.(RC[0-9]+|[0-9]+)$ ]] ; then
+# Make sure the Geode tag version is in agreed format: \d.\d.\d.\d.[RC\d]?
+if [[ ${GEODE_VERSION} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\.RC[0-9]+)?$ ]] ; then
echo "${GEODE_VERSION}-NORDIX.${BUILD_DATE}" > ${WORKSPACE}/geode-build-version/number
else
echo "ERROR: Incorrect geode version specified: ${GEODE_VERSION}"