From 3d2abecc67392bf21d5caaa4e86a8d8f4ebdc572 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 4 May 2020 07:30:31 +0200 Subject: [PATCH] Fix git describe call due to detached HEAD. --- resources/scripts/.travis-install-linux.sh | 2 +- resources/scripts/.travis-install-osx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/scripts/.travis-install-linux.sh b/resources/scripts/.travis-install-linux.sh index a6dc9ab61..e5d8bc4b0 100755 --- a/resources/scripts/.travis-install-linux.sh +++ b/resources/scripts/.travis-install-linux.sh @@ -28,7 +28,7 @@ set -- R*.AppImage rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi imagename="$1" -git_tag=$(git describe --abbrev=0) +git_tag=$(git describe --tags `git rev-list --tags --max-count=1`) git_revision=$(git rev-parse --short HEAD) if [ "$USE_WEBENGINE" = true ]; then diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index 1c8cd0226..eb563e919 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -19,7 +19,7 @@ set -- *.dmg rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi dmgname="$1" -git_tag=$(git describe --abbrev=0) +git_tag=$(git describe --tags `git rev-list --tags --max-count=1`) git_revision=$(git rev-parse --short HEAD) if [ "$USE_WEBENGINE" = true ]; then