From 0b02b7453e1e8f800b7d6b329eaf772a864411d0 Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Sat, 28 Aug 2021 23:28:00 -0700
Subject: [PATCH] Fix package version

---
 .github/workflows/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c6bdbe65..cdfa898d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -62,9 +62,9 @@ jobs:
           echo "GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
           echo "GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
           if [ "${{ env.GIT_TAG }}" ] ; then \
-            VERSION="${{ env.GIT_TAG }}" ; \
+            VERSION="$(git describe --tags --abbrev=0)" ; \
           else \
-            VERSION="${{ env.GIT_HASH }}-git" ; \
+            VERSION="$(git rev-parse --short HEAD)-git" ; \
           fi
           echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
       - name: 'Restore Cached Qt'
@@ -223,9 +223,9 @@ jobs:
           echo "GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
           echo "GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
           if [ "${{ env.GIT_TAG }}" ] ; then \
-            VERSION="${{ env.GIT_TAG }}" ; \
+            VERSION="$(git describe --tags --abbrev=0)" ; \
           else \
-            VERSION="${{ env.GIT_HASH }}-git" ; \
+            VERSION="$(git rev-parse --short HEAD)-git" ; \
           fi
           echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
       - name: 'Install prerequisites (Apt)'