Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.3.0] Updates and fixes to relnotes script #18470

Merged
merged 1 commit into from
May 22, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions scripts/release/relnotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,7 @@ def get_external_authors_between(base, head):
authors = git("log", f"{base}..{head}", "--format=%aN|%aE")
authors = set(
author.partition("|")[0].rstrip()
for author in authors
if not (author.endswith(("@google.com", "@users.noreply.github.com")))
)
for author in authors if not (author.endswith(("@google.com"))))

# Get all co-authors
contributors = git(
Expand All @@ -149,9 +147,7 @@ def get_external_authors_between(base, head):

coauthors = []
for coauthor in contributors:
if coauthor and not re.search(
"@google.com|@users.noreply.github.com", coauthor
):
if coauthor and not re.search("@google.com", coauthor):
coauthors.append(
" ".join(re.sub(r"Co-authored-by: |<.*?>", "", coauthor).split())
)
Expand All @@ -162,11 +158,12 @@ def get_external_authors_between(base, head):
# Get last release and make sure it's consistent with current X.Y.Z release
# e.g. if current_release is 5.3.3, last_release should be 5.3.2 even if
# latest release is 6.1.1
current_release = git("rev-parse", "--abbrev-ref", "HEAD")
current_release = re.sub(
r"rc\d", "", current_release[0].removeprefix("release-")
)
current_release = git("rev-parse", "--abbrev-ref", "HEAD")[0]
if not current_release.startswith("release-"):
print("Error: Not a release- branch")
sys.exit(1)

current_release = re.sub(r"rc\d", "", current_release[len("release-"):])
is_major = bool(re.fullmatch(r"\d+.0.0", current_release))

tags = [tag for tag in git("tag", "--sort=refname") if "pre" not in tag]
Expand Down