From cc1254d6487dc83e36e91bb3ff58867d630793ed Mon Sep 17 00:00:00 2001 From: Kent Yao Date: Tue, 13 Jul 2021 17:32:47 +0800 Subject: [PATCH] [BUILD] Update PR Merge tool (#790) * [BUILD] Update PR Merge tool * [BUILD] Update PR Merge tool * [BUILD] Update PR Merge tool * [BUILD] Update PR Merge tool --- dev/merge_kyuubi_pr.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dev/merge_kyuubi_pr.py b/dev/merge_kyuubi_pr.py index e7fed2bfe..763b4b54d 100755 --- a/dev/merge_kyuubi_pr.py +++ b/dev/merge_kyuubi_pr.py @@ -18,6 +18,12 @@ # # Utility for creating well-formed pull request merges and pushing them to Kyuubi +# For committers: +# Please check your local git envs via `git remote -v` which should +# apache git@github.com:apache/incubator-kyuubi.git (fetch) +# apache git@github.com:apache/incubator-kyuubi.git (push) +# origin git@github.com:[ YOUR GITHUB USER NAME ]/incubator-kyuubi.git (fetch) +# origin git@github.com:[ YOUR GITHUB USER NAME ]/incubator-kyuubi.git (push) import json import os @@ -29,10 +35,10 @@ from urllib.request import Request from urllib.error import HTTPError KYUUBI_HOME = os.environ.get("KYUUBI_HOME", os.getcwd()) -PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "origin") -PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "origin") +PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache") +PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache") GITHUB_OAUTH_KEY = os.environ.get("GITHUB_OAUTH_KEY") -GITHUB_API_BASE = "https://api.github.com/repos/NetEase/kyuubi" +GITHUB_API_BASE = "https://api.github.com/repos/apache/incubator-kyuubi" BRANCH_PREFIX = "PR_TOOL"