From 1849c39c4c4bdc0ecb4d6802573befa28dc5366d Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Sat, 28 Aug 2021 23:37:04 -0700
Subject: [PATCH] CI: Fix git tag recognition

---
 .github/workflows/main.yml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cdfa898d..b14ab442 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,12 +59,14 @@ jobs:
         working-directory: ${{ github.workspace }}/obs-websocket
         run: |
           git fetch --prune --unshallow
-          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="$(git describe --tags --abbrev=0)" ; \
+          GIT_HASH=$(git rev-parse --short HEAD)
+          echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV
+          GIT_TAG=$(git describe --tags --abbrev=0)
+          echo "GIT_TAG=$GIT_TAG" >> $GITHUB_ENV
+          if [ "$GIT_TAG" ] ; then \
+            VERSION="$GIT_TAG" ; \
           else \
-            VERSION="$(git rev-parse --short HEAD)-git" ; \
+            VERSION="$GIT_HASH-git" ; \
           fi
           echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
       - name: 'Restore Cached Qt'
@@ -179,7 +181,7 @@ jobs:
         if: success()
         uses: actions/upload-artifact@v2-preview
         with:
-          name: '${{ env.GIT_HASH }}-Windows'
+          name: 'obs-websocket-${{ env.PACKAGE_VERSION }}-Windows'
           path: ${{ github.workspace }}/obs-websocket/package/*.zip
       - name: 'Publish ${{ env.WIN_FILENAME }}-Installer.exe'
         if: success()
@@ -220,12 +222,14 @@ jobs:
         working-directory: ${{ github.workspace }}/obs-websocket
         run: |
           git fetch --prune --unshallow
-          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="$(git describe --tags --abbrev=0)" ; \
+          GIT_HASH=$(git rev-parse --short HEAD)
+          echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV
+          GIT_TAG=$(git describe --tags --abbrev=0)
+          echo "GIT_TAG=$GIT_TAG" >> $GITHUB_ENV
+          if [ "$GIT_TAG" ] ; then \
+            VERSION="$GIT_TAG" ; \
           else \
-            VERSION="$(git rev-parse --short HEAD)-git" ; \
+            VERSION="$GIT_HASH-git" ; \
           fi
           echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
       - name: 'Install prerequisites (Apt)'