Merge pull request #3559 from anoma/tomas/fix-ci-changelog-base

CI/changelog: diff PR branch against origin/main
anoma · Jul 29, 2024 · 22bf6e7 · 22bf6e7
2 parents 292cf89 + 89f867e
commit 22bf6e7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/scripts/check-changelog.sh b/.github/workflows/scripts/check-changelog.sh
@@ -13,7 +13,7 @@ check_changelog_added_in_subfolders() {
     subfolder_pattern=$(printf "|%s" "${subfolders[@]}")
     subfolder_pattern=${subfolder_pattern:1} # Remove the leading '|'
 
-    added_files=$(git diff --diff-filter=A --name-only "main..$head_commit" | grep "\.changelog/")
+    added_files=$(git diff --diff-filter=A --name-only "origin/main..$head_commit" | grep "\.changelog/")
 
     relevant_files=$(echo "$added_files" | grep -E "\.changelog/unreleased/($subfolder_pattern)/")