From 826008b580ae5cbe1186f64948cbef880a7874c5 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Tue, 30 Nov 2021 07:56:43 -0800
Subject: [PATCH] Fix release tagging (#4741)

---
 .github/workflows/patch-release-build.yml | 1 +
 .github/workflows/release-build.yml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/patch-release-build.yml b/.github/workflows/patch-release-build.yml
index 69efceaf4f98..d1053ce351af 100644
--- a/.github/workflows/patch-release-build.yml
+++ b/.github/workflows/patch-release-build.yml
@@ -279,6 +279,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ github.event.inputs.version }}
+          commitish: ${{ needs.prepare-release-branch.outputs.release-branch-name }}
           release_name: Release v${{ github.event.inputs.version }}
           draft: true
           prerelease: false
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 7727683246be..21d796d2d7c8 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -195,6 +195,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ github.event.inputs.version }}
+          commitish: ${{ github.event.inputs.release-branch-name }}
           release_name: Release v${{ github.event.inputs.version }}
           draft: true
           prerelease: false