From 620a80b79e3ac52dd3d44437940e24394e4d776b Mon Sep 17 00:00:00 2001
From: DanStough <dan.stough@hashicorp.com>
Date: Thu, 4 May 2023 17:24:17 -0400
Subject: [PATCH] chore(ci): fix changelog action for non-main base branches

---
 .github/workflows/changelog-checker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog-checker.yml b/.github/workflows/changelog-checker.yml
index 1c41634fd3..ab76073047 100644
--- a/.github/workflows/changelog-checker.yml
+++ b/.github/workflows/changelog-checker.yml
@@ -36,7 +36,7 @@ jobs:
             changelog_file_path=".changelog/[_0-9]*.txt"
           fi
 
-          changelog_files=$(git --no-pager diff --name-only HEAD "$(git merge-base HEAD "origin/main")" | egrep ${changelog_file_path})
+          changelog_files=$(git --no-pager diff --name-only HEAD "$(git merge-base HEAD "origin/${{ github.event.pull_request.base.ref }}")" | egrep -e "${changelog_file_path}"))
 
           # If we do not find a file in .changelog/, we fail the check
           if [ -z "$changelog_files" ]; then