Update publish script

forntoh · Oct 7, 2024 · 0d1545c · 0d1545c
1 parent e28cd36
commit 0d1545c
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -41,19 +41,21 @@ jobs:
 
       - name: Commit changes
         env:
-          GH_PAT: ${{ secrets.GH_PAT }}
+          GH_TOKEN: ${{ secrets.GH_PAT }}
         run: |
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
           git add .
           git commit -m "Update version to $UPDATED_VERSION"
-          git push https://x-access-token:${GH_PAT}@github.com/${{ github.repository }}.git master
+          git push https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git master --force
 
       - name: Create Tag
         if: ${{ env.UPDATED_VERSION != '' }}
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT }}
         run: |
           git tag -a "${{ env.UPDATED_VERSION }}" -m "Tagging version ${{ env.UPDATED_VERSION }}"
-          git push https://x-access-token:${GH_PAT}@github.com/${{ github.repository }}.git "${{ env.UPDATED_VERSION }}"
+          git push https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git "${{ env.UPDATED_VERSION }}" --force
 
       - name: Publish to PlatformIO
         id: publish
@@ -63,11 +65,11 @@ jobs:
       - name: Revert push and delete tag if publish fails
         if: failure()
         env:
-          GH_PAT: ${{ secrets.GH_PAT }}
+          GH_TOKEN: ${{ secrets.GH_PAT }}
         run: |
           git reset --hard HEAD~1
-          git push https://x-access-token:${GH_PAT}@github.com/${{ github.repository }}.git +HEAD
-          git tag -d ${{ github.ref_name }}
+          git push https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git +HEAD --force
+          git tag -d ${{ env.UPDATED_VERSION }}
 
       - name: Create GitHub Release
         if: success()
@@ -78,4 +80,4 @@ jobs:
           tag_name: ${{ github.ref_name }}
           release_name: LcdMenu v${{ github.ref_name }}
           draft: true
-          prerelease: false
+          prerelease: false