From dcfc48d84bd72e3a9e7b24ad2753d8df353853ac Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 8 Oct 2023 23:20:28 +1000 Subject: [PATCH] CI: Fix Flatpak version generation --- scripts/generate-metainfo.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/generate-metainfo.sh b/scripts/generate-metainfo.sh index fbb3cc1e5..b2540327e 100755 --- a/scripts/generate-metainfo.sh +++ b/scripts/generate-metainfo.sh @@ -13,15 +13,12 @@ OUTFILE="${OUTDIR}/${APPID}.metainfo.xml" pushd "${SCRIPTDIR}" >/dev/null GIT_DATE=$(git log -1 --pretty=%cd --date=short) -GIT_VERSION=$(git tag --points-at HEAD) GIT_HASH=$(git rev-parse HEAD) - +GIT_VERSION=$(git describe --dirty | tr -d '\r\n') if [[ "${GIT_VERSION}" == "" ]]; then - GIT_VERSION=$(git describe --dirty | tr -d '\r\n') - if [[ "${GIT_VERSION}" == "" ]]; then - GIT_VERSION=$(git rev-parse HEAD) - fi + GIT_VERSION=$(git rev-parse HEAD) fi + popd >/dev/null echo "GIT_DATE: ${GIT_DATE}"