Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0998ced

Browse files
authored
chore(scripts): fix a few release script changelog issues (#13200)
1 parent92c5dfa commit0998ced

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

‎scripts/release.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ new_version="${new_version%$'\n'}" # Remove the trailing newline.
210210

211211
release_notes="$(execrelative ./release/generate_release_notes.sh --old-version"$old_version" --new-version"$new_version" --ref"$ref")"
212212

213+
mkdir -p build
213214
release_notes_file="build/RELEASE-${new_version}.md"
214215
if((dry_run));then
215216
release_notes_file="build/RELEASE-${new_version}-DRYRUN.md"

‎scripts/release/check_commit_metadata.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ main() {
9999
git_cherry_out=$(
100100
{
101101
git log --no-merges --cherry-mark --pretty=format:"%m %H %s""${to_ref}...origin/main"
102+
echo
102103
git log --no-merges --cherry-mark --pretty=format:"%m %H %s""${from_ref}...origin/main"
104+
echo
103105
}| { grep'^='||true; }| sort -u| sort -k3
104106
)
105107
if [[-n${git_cherry_out} ]];then
@@ -209,6 +211,15 @@ main() {
209211
fi
210212
fi
211213

214+
author=
215+
if [[ -v authors[${commit_sha_long}] ]];then
216+
author=${authors[${commit_sha_long}]}
217+
if [[${author}=="app/dependabot" ]];then
218+
log"Skipping commit by app/dependabot${commit_sha_short} (${commit_sha_long})"
219+
continue
220+
fi
221+
fi
222+
212223
if [[${left_right}=="<" ]];then
213224
# Skip commits that are already in main.
214225
log"Skipping commit${commit_sha_short} from other branch (${commit_sha_long}${title})"
@@ -218,7 +229,7 @@ main() {
218229
COMMIT_METADATA_COMMITS+=("${commit_sha_long_orig}")
219230

220231
# Safety-check, guarantee all commits had their metadata fetched.
221-
if [[! -v authors[${commit_sha_long}] ]]|| [[! -v labels[${commit_sha_long}] ]];then
232+
if [[-z${author} ]]|| [[! -v labels[${commit_sha_long}] ]];then
222233
if [[${ignore_missing_metadata}!= 1 ]];then
223234
error"Metadata missing for commit${commit_sha_short} (${commit_sha_long})"
224235
else
@@ -228,8 +239,8 @@ main() {
228239

229240
# Store the commit title for later use.
230241
COMMIT_METADATA_TITLE[${commit_sha_short}]=${title}
231-
if [[ -v authors[${commit_sha_long}] ]];then
232-
COMMIT_METADATA_AUTHORS[${commit_sha_short}]="@${authors[${commit_sha_long}]}"
242+
if [[-n${author} ]];then
243+
COMMIT_METADATA_AUTHORS[${commit_sha_short}]="@${author}"
233244
fi
234245

235246
# Create humanized titles where possible, examples:

‎scripts/release/generate_release_notes.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ for commit in "${commits[@]}"; do
147147
title="${title} (${commit})"
148148
fi
149149
line="-${title}"
150-
line=${line//) (/, )}
151150
if [[ -v COMMIT_METADATA_AUTHORS[${commit}] ]];then
152151
line+=" (${COMMIT_METADATA_AUTHORS[${commit}]})"
153152
fi

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp