From 7f32876d4ca0cfd45d7fdf4309e1d4bbb3729ede Mon Sep 17 00:00:00 2001 From: gordonwwang Date: Fri, 18 Aug 2023 10:58:18 +0800 Subject: [PATCH] 1. remove -D in rpmdev-bumpspec; 2. git clone adds five retries; --- auto_release_increases/auto_release.sh | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/auto_release_increases/auto_release.sh b/auto_release_increases/auto_release.sh index e44fa6b..91f8459 100755 --- a/auto_release_increases/auto_release.sh +++ b/auto_release_increases/auto_release.sh @@ -40,11 +40,25 @@ function fork_clone_repo() else echo "###### Failed to fork repository.${gitee_repo}.$fork_result ######" exit 1 + fi + + # clone repo + clone_success=false + for i in {1..5}; do + sleep 1 + rm -rf $pkg_name + + git clone "https://gitee.com/${gitee_repoowner}/${gitee_repo}.git" --quiet + if [ $? -eq 0 ]; then + clone_success=true + break + fi + done + + if ! $clone_success; then + echo "Failed to clone the repository after 5 attempts." + exit 1 fi - sleep 1 - - rm -rf $pkg_name - git clone "https://gitee.com/${gitee_repoowner}/${gitee_repo}.git" --quiet } ## 2. 修改spec文件,Release+1和changelog @@ -55,7 +69,8 @@ function modi_spec() if true ; then # use rpmdev-bumpspec to auto Release +1 - rpmdev-bumpspec -D -u "$commit_auth" -c "$commit_info" $pkg_spec + # rpmdev-bumpspec -D -u "$commit_auth" -c "$commit_info" $pkg_spec + rpmdev-bumpspec -u "$commit_auth" -c "$commit_info" $pkg_spec else # use rpmspec -P to auto Release +1 # get "Release:" @@ -144,6 +159,7 @@ function handle_pkgs() # 如不需要提PR,请注释下行 PR_repo PR_repo $pkg_name cd $cur_patch + rm -rf $pkg_name # 执行成功的,保存到file_success echo $pkg_name >> $file_success -- Gitee