From 20d584a3045a66897ff3d76b3802ada68919fd86 Mon Sep 17 00:00:00 2001 From: Xiaojie Chen Date: Fri, 4 Aug 2023 15:03:45 +0800 Subject: [PATCH] Fix the case where the username and repo owner are different --- auto_release_increases/auto_release.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/auto_release_increases/auto_release.sh b/auto_release_increases/auto_release.sh index 6abf5c5..646d3df 100755 --- a/auto_release_increases/auto_release.sh +++ b/auto_release_increases/auto_release.sh @@ -6,11 +6,13 @@ commit_auth="Name email" # commit_info="Rebuilt for rust 1.69.0" # commit_auth="Wang Guodong " -# git仓库的仓库域名、私人tocken +# git仓库的仓库域名、私人tocken、仓库所属的空间地址 gitee_username="Your_Name" gitee_tocken="Your_Gitee_Tocken" +gitee_repoowner="Your_Repo_Owner" # gitee_username="gordonwwang" # gitee_tocken="xxxxx" +# gitee_repoowner="gordonwwang" // 存在和用户名不同的情况，根据具体情况配置 #****************** 无需修改 ****************# gitee_api="https://gitee.com/api/v5" @@ -34,8 +36,9 @@ function fork_clone_repo() else echo "###### Failed to fork repository.${gitee_repo}.$fork_result ######" fi + sleep 1 - git clone "https://gitee.com/${gitee_username}/${gitee_repo}.git" --quiet + git clone "https://gitee.com/${gitee_repoowner}/${gitee_repo}.git" --quiet } ## 2. 修改spec文件，Release+1和changelog @@ -73,7 +76,7 @@ function push_repo() # set Git credential for git push git config credential.helper "store --file=.git/gitee_credentials" - echo "https://${gitee_username}:${gitee_tocken}@gitee.com" > .git/gitee_credentials + echo "https://${gitee_repoowner}:${gitee_tocken}@gitee.com" > .git/gitee_credentials git commit -am "$commit_info" --quiet git push origin master --quiet @@ -93,7 +96,7 @@ function PR_repo() { # create PR pr_title="$commit_info" pr_body="auto release +1 by mybot" - pr_head="${gitee_username}:master" + pr_head="${gitee_repoowner}:master" pr_base="master" pr_url="${gitee_api}/repos/opencloudos-stream/${gitee_repo}/pulls" -- Gitee