Merge pull request #361 from vmware-tanzu/releng/fixreleasetag

Align RC and GA builds, Fix Dev Tagging

.github/workflows/release.yaml

@@ -108,12 +108,13 @@ jobs:
         destination: tce-cli-plugins
         credentials: ${{ secrets.GCP_BUCKET_SA }}
 
-  post-build:
-    steps:
+    - name: Reset repo
+      run: |
+        git reset --hard
     
     - name: Checkout for Update
       uses: actions/checkout@v2
 
-    - name: Commit New Version 
+    - name: Commit Next Dev Version 
       run: |
         make tag-release

hack/update-tag.sh

@@ -20,6 +20,6 @@ git config user.name github-actions
 git config user.email github-actions@github.com
 git add hack/DEV_BUILD_VERSION.yaml
 git commit -m "auto-generated - update dev version"
-git push origin HEAD:main --force
-git tag -m "${NEW_BUILD_VERSION}" "${NEW_BUILD_VERSION}"
-git push --tags
+git push -f origin HEAD:main
+git tag -f -m "${NEW_BUILD_VERSION}" "${NEW_BUILD_VERSION}"
+git push -f origin "${NEW_BUILD_VERSION}"