Merge 620a80b into backport/dans/fix-changelog-detection-for-non-main…

…-branches/perfectly-skilled-moth
hashicorp · May 8, 2023 · dc103c0 · dc103c0
2 parents 6e80558 + 620a80b
commit dc103c0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/changelog-checker.yml b/.github/workflows/changelog-checker.yml
@@ -34,7 +34,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