HOTFIX - Use the merge commit when cutting a tag for release (#2078)

department-of-veterans-affairs · Oct 23, 2024 · fa2ed1b · fa2ed1b
1 parent d73d442
commit fa2ed1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/scripts/prData.js b/.github/scripts/prData.js
@@ -24,11 +24,11 @@ async function fetchPullRequests(github, owner, repo, sha) {
  * @param {string} repo - The repository name.
  * @returns {Promise<string>} - A promise resolving to the SHA of the latest commit on the main branch.
  */
-async function fetchMainBranchSha(github, owner, repo) {
+async function fetchMainBranchSha(github, owner, repo, ref) {
   const { data } = await github.rest.repos.getCommit({
     owner,
     repo,
-    ref: 'heads/main',
+    ref: ref
   });
 
   if (data && data.sha) {
@@ -94,7 +94,7 @@ async function prData(params) {
   try {
     const pullRequestData = await fetchPullRequests(github, owner, repo, sha);
     const currentVersion = await getReleaseVersionValue(github, owner, repo);
-    const mainBranchSha = await fetchMainBranchSha(github, owner, repo);
+    const mainBranchSha = await fetchMainBranchSha(github, owner, repo, sha);
 
     const labels = pullRequestData.data[0].labels;
     const prNumber = pullRequestData.data[0].number;

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -75,7 +75,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v4
         with:
-          ref: ${{ steps.set-outputs.outputs.tag }}
+          ref: ${{ needs.setup-environment.outputs.tag }}
       - name: Build and Push Artifacts
         uses: ./.github/actions/build-push-artifacts
         with: