From 2a5d8bbf455b3907b2f2f06bb55b065c4e485426 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Thu, 6 Aug 2020 07:07:25 -0700
Subject: [PATCH] Fix scenario where there's no updates to re-tag

---
 .github/workflows/push-and-package.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/push-and-package.yml b/.github/workflows/push-and-package.yml
index b14221199b..3c02b2a05f 100644
--- a/.github/workflows/push-and-package.yml
+++ b/.github/workflows/push-and-package.yml
@@ -83,13 +83,17 @@ jobs:
         git fetch --tags --force
         git branch ${{ steps.get_tag_name.outputs.tag }}-temp-branch
         git add -u
-        git commit -m 'Automated update of common script sources and hash'
+        git commit -m 'Automated update of common script sources and hash' || export NO_UPDATES="true"
 
         # Re-tag and push to origin
-        git tag -d ${{ steps.get_tag_name.outputs.tag }}
-        git tag ${{ steps.get_tag_name.outputs.tag }}
-        git push --delete origin ${{ steps.get_tag_name.outputs.tag }}
-        git push origin ${{ steps.get_tag_name.outputs.tag }}
+        if [ "${NO_UPDATES}" != "true" ]; then 
+            git tag -d ${{ steps.get_tag_name.outputs.tag }}
+            git tag ${{ steps.get_tag_name.outputs.tag }}
+            git push --delete origin ${{ steps.get_tag_name.outputs.tag }}
+            git push origin ${{ steps.get_tag_name.outputs.tag }}
+        else 
+            echo "No updates to re-tag."
+        fi
 
     - name: Package
       id: package