From 5e25e68b5351b33a74287cb8b553943f7a8cb53b Mon Sep 17 00:00:00 2001 From: Grant Gainey Date: Tue, 26 Mar 2024 18:31:54 -0400 Subject: [PATCH] Fixed check-release to actually diff correct branches. [noissue] --- templates/github/.ci/scripts/check_release.py.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/github/.ci/scripts/check_release.py.j2 b/templates/github/.ci/scripts/check_release.py.j2 index c9b2131b..3b36ac62 100755 --- a/templates/github/.ci/scripts/check_release.py.j2 +++ b/templates/github/.ci/scripts/check_release.py.j2 @@ -73,7 +73,9 @@ def main(): z_changelog = True last_tag = repo.git.describe("--tags", "--abbrev=0", f"origin/{branch}") - req_txt_diff = repo.git.diff(f"{last_tag}..HEAD", "--name-only", "requirements.txt") + req_txt_diff = repo.git.diff( + f"{last_tag}", f"origin/{branch}", "--name-only", "--", "requirements.txt" + ) if z_changelog or req_txt_diff: # Blobless clone does not have file contents for Z branches, # check commit message for last Z bump