From f7dc4fc16187a0d06970a73d310abf48671966af Mon Sep 17 00:00:00 2001 From: Natasha Pirogova Date: Thu, 13 Mar 2025 10:31:22 +0300 Subject: [PATCH 1/2] Fix scripts --- .github/actions/update_changelog/update_changelog.py | 6 ++++-- .github/workflows/validate_pr_description.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/actions/update_changelog/update_changelog.py b/.github/actions/update_changelog/update_changelog.py index 538703705bfd..bdfeb69ad5c0 100644 --- a/.github/actions/update_changelog/update_changelog.py +++ b/.github/actions/update_changelog/update_changelog.py @@ -123,7 +123,8 @@ def update_changelog(changelog_path, pr_data): if validate_pr_description(pr["body"], is_not_for_cl_valid=False): category = extract_changelog_category(pr["body"]) category = match_pr_to_changelog_category(category) - body = extract_changelog_body(pr["body"]) + dirty_body = extract_changelog_body(pr["body"]) + body = dirty_body.replace("\r", "") if category and body: body += f" [#{pr['number']}]({pr['url']})" body += f" ([{pr['name']}]({pr['user_url']}))" @@ -190,12 +191,13 @@ def fetch_user_details(username): try: pr_details = fetch_pr_details(pr["id"]) user_details = fetch_user_details(pr_details["user"]["login"]) + name = user_details.get("name", None) if validate_pr_description(pr_details["body"], is_not_for_cl_valid=False): pr_data.append({ "number": pr_details["number"], "body": pr_details["body"].strip(), "url": pr_details["html_url"], - "name": user_details.get("name", pr_details["user"]["login"]), # Use login if name is not available + "name": name or pr_details["user"]["login"], # Use login if name is not available "user_url": pr_details["user"]["html_url"] }) except Exception as e: diff --git a/.github/workflows/validate_pr_description.yml b/.github/workflows/validate_pr_description.yml index 8a60266d8bfa..2fb48d90abce 100644 --- a/.github/workflows/validate_pr_description.yml +++ b/.github/workflows/validate_pr_description.yml @@ -16,6 +16,8 @@ jobs: steps: - name: Check out the repository uses: actions/checkout@v4 + with: + ref: main - name: Use custom PR validation action id: validate From de2db57ae37143a5ad4ed250b8a6e2efdb56d82d Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 16 Mar 2025 02:02:32 +0000 Subject: [PATCH 2/2] Update CHANGELOG.md for 2025-03-16 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000000..ddb27686c0eb --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +## Unreleased +