fix(sync-actions): create tag when no changes; tag merge commit when PR merges (#19)

* Initial plan

* fix: create tag when no changes and tag merge commit when PR is merged

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

* fix: use git checkout -B to robustly reset to origin/main before tagging

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Author: Copilot

.github/workflows/sync-actions.yml

@@ -329,10 +329,19 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create tag
-        if: steps.resolve-ref.outputs.should_create_tag == 'true' && steps.create-pr.outputs.changed == 'true'
+        if: steps.resolve-ref.outputs.should_create_tag == 'true'
         run: |
           echo "::group::Creating Tag"
           cd gh-aw-actions
+
+          # When a PR was created and merged, we need to pull the merge commit from main
+          # because the working directory is still on the sync branch.
+          if [[ "${{ steps.create-pr.outputs.changed }}" == "true" ]]; then
+            echo "PR was merged — fetching main to tag the merge commit..."
+            git fetch origin main
+            git checkout -B main origin/main
+          fi
+
           TAG="${{ steps.resolve-ref.outputs.raw_ref }}"
           echo "Creating tag: $TAG"