diff --git a/docs/mindspore/source_en/conf.py b/docs/mindspore/source_en/conf.py index 0110468973d278012ad45b218be9168651806dae..323e630193cf296f17dd17763685f0594d0d314e 100644 --- a/docs/mindspore/source_en/conf.py +++ b/docs/mindspore/source_en/conf.py @@ -670,11 +670,7 @@ copy_image(src_dir, des_dir) # copy RELEASENotes src_release = os.path.join(repo_path, 'RELEASE.md') des_release = "./RELEASE.md" -<<<<<<< HEAD release_source = f'[![View Source On Gitee](https://mindspore-website.obs.cn-north-4.myhuaweicloud.com/website-images/{docs_branch}/resource/_static/logo_source_en.svg)](https://atomgit.com/mindspore/{copy_repo}/blob/{branch}/' + 'RELEASE.md)\n' -======= -release_source = f'[![View Source on AtomGit](https://mindspore-website.obs.cn-north-4.myhuaweicloud.com/website-images/{docs_branch}/resource/_static/logo_source_en.svg)](https://gitee.com/mindspore/{copy_repo}/blob/{branch}/' + 'RELEASE.md)\n' ->>>>>>> 2afcb0b0dc (update view source links) with open(src_release, "r", encoding="utf-8") as f: data = f.read() diff --git a/tools/ci_pipeline_gate_APIView/generate_pr_html.py b/tools/ci_pipeline_gate_APIView/generate_pr_html.py index 2014b0d1cb1ab491d27397dc45e2a932ef651293..ec478a4c03f079177b3495335b17451cff3436e9 100644 --- a/tools/ci_pipeline_gate_APIView/generate_pr_html.py +++ b/tools/ci_pipeline_gate_APIView/generate_pr_html.py @@ -1252,14 +1252,14 @@ if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument('--pr_url', type=str, default="") # pr网址 parser.add_argument('--whl_path', type=str, default="") # 安装包地址 + parser.add_argument('--atomgit_token', type=str, default="") # atomgit API访问令牌 args = parser.parse_args() pr_url = args.pr_url pr_whl_path = args.whl_path + atomgit_token = args.atomgit_token - # 获取Token - TOKEN = os.getenv("GITCODE_TOKEN") - headers = {"Private-Token": TOKEN} if TOKEN else {} + headers = {"Private-Token": atomgit_token} if atomgit_token else {} # 参数处理(准备工作) pr_info = re.match(r'https://(?:atomgit|gitcode)\.com/([^/]+)/([^/]+)/pull/(\d+)', pr_url)