From 5d43060cdc17f72b1c25b6ff0d98f77b7fb79ea5 Mon Sep 17 00:00:00 2001
From: Francisco <fg@frang.io>
Date: Tue, 3 Oct 2023 15:46:18 -0300
Subject: [PATCH] Fix release tagging (#4646)

---
 .github/workflows/release-cycle.yml        | 4 ----
 scripts/release/workflow/github-release.js | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/release-cycle.yml b/.github/workflows/release-cycle.yml
index 21d77abb9..12da449f9 100644
--- a/.github/workflows/release-cycle.yml
+++ b/.github/workflows/release-cycle.yml
@@ -147,16 +147,12 @@ jobs:
         with:
           name: ${{ github.ref_name }}
           path: ${{ steps.pack.outputs.tarball }}
-      - name: Tag
-        run: npx changeset tag
       - name: Publish
         run: bash scripts/release/workflow/publish.sh
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           TARBALL: ${{ steps.pack.outputs.tarball }}
           TAG: ${{ steps.pack.outputs.tag }}
-      - name: Push tags
-        run: git push --tags
       - name: Create Github Release
         uses: actions/github-script@v6
         env:
diff --git a/scripts/release/workflow/github-release.js b/scripts/release/workflow/github-release.js
index 92a47d9d7..f213106b8 100644
--- a/scripts/release/workflow/github-release.js
+++ b/scripts/release/workflow/github-release.js
@@ -9,6 +9,7 @@ module.exports = async ({ github, context }) => {
     owner: context.repo.owner,
     repo: context.repo.repo,
     tag_name: `v${version}`,
+    target_commitish: github.ref_name,
     body: extractSection(changelog, version),
     prerelease: process.env.PRERELEASE === 'true',
   });