From 77834408ea85a84c855a2a63c730587607b3a5fe Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 23 Apr 2025 15:02:21 +0300 Subject: [PATCH 1/2] fix(scripts/release): handle cherry-pick bot titles in check commit metadata --- scripts/release/check_commit_metadata.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/release/check_commit_metadata.sh b/scripts/release/check_commit_metadata.sh index f53de8e107430..dab673844d475 100755 --- a/scripts/release/check_commit_metadata.sh +++ b/scripts/release/check_commit_metadata.sh @@ -118,6 +118,23 @@ main() { title2=${parts2[*]:2} fi + # Handle cherry-pick bot, it turns "chore: foo bar (#42)" to + # "chore: foo bar (cherry-pick #42) (#43)". + if [[ ${title1} == *"(cherry-pick #"* ]]; then + title1=${title1%" ("*} + pr=${title1#*#} + pr=${pr%)} + title1=${title1%" ("*} + title1="${title1} (#${pr})"$'\n' + fi + if [[ ${title2} == *"(cherry-pick #"* ]]; then + title2=${title2%" ("*} + pr=${title2#*#} + pr=${pr%)} + title2=${title2%" ("*} + title2="${title2} (#${pr})"$'\n' + fi + if [[ ${title1} != "${title2}" ]]; then log "Invariant failed, cherry-picked commits have different titles: \"${title1%$'\n'}\" != \"${title2%$'\n'}\", attempting to check commit body for cherry-pick information..." From 00453247d801abbd364a2996e94e0b2313e1f05c Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 23 Apr 2025 15:06:54 +0300 Subject: [PATCH 2/2] gulp --- scripts/release/check_commit_metadata.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/release/check_commit_metadata.sh b/scripts/release/check_commit_metadata.sh index dab673844d475..1368425d00639 100755 --- a/scripts/release/check_commit_metadata.sh +++ b/scripts/release/check_commit_metadata.sh @@ -122,14 +122,14 @@ main() { # "chore: foo bar (cherry-pick #42) (#43)". if [[ ${title1} == *"(cherry-pick #"* ]]; then title1=${title1%" ("*} - pr=${title1#*#} + pr=${title1##*#} pr=${pr%)} title1=${title1%" ("*} title1="${title1} (#${pr})"$'\n' fi if [[ ${title2} == *"(cherry-pick #"* ]]; then title2=${title2%" ("*} - pr=${title2#*#} + pr=${title2##*#} pr=${pr%)} title2=${title2%" ("*} title2="${title2} (#${pr})"$'\n' pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy