未验证 提交 e3e3fa60 编写于 作者: T tianshuo78520a 提交者: GitHub

Revert "Del github api token (#42330)" (#42544)

This reverts commit 2c5cecb1.
上级 503569a0
...@@ -959,7 +959,7 @@ function check_whl_size() { ...@@ -959,7 +959,7 @@ function check_whl_size() {
whldiffSize=`echo $(($pr_whl_size - $dev_whl_size))` whldiffSize=`echo $(($pr_whl_size - $dev_whl_size))`
if [ ${whldiffSize} -gt 10 ]; then if [ ${whldiffSize} -gt 10 ]; then
approval_line=`curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000` approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 22334008 22361972` APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 22334008 22361972`
echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
if [ "${APPROVALS}" == "FALSE" ]; then if [ "${APPROVALS}" == "FALSE" ]; then
...@@ -1053,13 +1053,13 @@ function generate_api_spec() { ...@@ -1053,13 +1053,13 @@ function generate_api_spec() {
function check_approvals_of_unittest() { function check_approvals_of_unittest() {
set +x set +x
if [ "$GIT_PR_ID" == "" ]; then if [ "$GITHUB_API_TOKEN" == "" ] || [ "$GIT_PR_ID" == "" ]; then
return 0 return 0
fi fi
# approval_user_list: XiaoguangHu01 46782768,luotao1 6836917,phlrain 43953930,lanxianghit 47554610, zhouwei25 52485244, kolinwei 22165420 # approval_user_list: XiaoguangHu01 46782768,luotao1 6836917,phlrain 43953930,lanxianghit 47554610, zhouwei25 52485244, kolinwei 22165420
check_times=$1 check_times=$1
if [ $check_times == 1 ]; then if [ $check_times == 1 ]; then
approval_line=`curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000` approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
if [ "${approval_line}" != "" ]; then if [ "${approval_line}" != "" ]; then
APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 22165420 52485244` APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 22165420 52485244`
echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
...@@ -1073,7 +1073,7 @@ function check_approvals_of_unittest() { ...@@ -1073,7 +1073,7 @@ function check_approvals_of_unittest() {
elif [ $check_times == 2 ]; then elif [ $check_times == 2 ]; then
unittest_spec_diff=`python ${PADDLE_ROOT}/tools/diff_unittest.py ${PADDLE_ROOT}/paddle/fluid/UNITTEST_DEV.spec ${PADDLE_ROOT}/paddle/fluid/UNITTEST_PR.spec` unittest_spec_diff=`python ${PADDLE_ROOT}/tools/diff_unittest.py ${PADDLE_ROOT}/paddle/fluid/UNITTEST_DEV.spec ${PADDLE_ROOT}/paddle/fluid/UNITTEST_PR.spec`
if [ "$unittest_spec_diff" != "" ]; then if [ "$unittest_spec_diff" != "" ]; then
approval_line=`curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000` approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 22165420 52485244 32428676 45041955` APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 22165420 52485244 32428676 45041955`
echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
if [ "${APPROVALS}" == "FALSE" ]; then if [ "${APPROVALS}" == "FALSE" ]; then
...@@ -1106,7 +1106,7 @@ function check_approvals_of_unittest() { ...@@ -1106,7 +1106,7 @@ function check_approvals_of_unittest() {
EOF EOF
if [ `echo "20 < $AllDiffSize"|bc` -eq 1 ] ; then if [ `echo "20 < $AllDiffSize"|bc` -eq 1 ] ; then
approval_line=`curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000` approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 39303645 328693` APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 39303645 328693`
echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
if [ "${APPROVALS}" == "FALSE" ]; then if [ "${APPROVALS}" == "FALSE" ]; then
...@@ -2853,7 +2853,7 @@ function test_op_benchmark() { ...@@ -2853,7 +2853,7 @@ function test_op_benchmark() {
# The PR will pass quickly when get approval from specific person. # The PR will pass quickly when get approval from specific person.
# Xreki 12538138, luotao1 6836917, ZzSean 32410583 # Xreki 12538138, luotao1 6836917, ZzSean 32410583
set +x set +x
approval_line=$(curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000) approval_line=$(curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000)
if [ "${approval_line}" != "" ]; then if [ "${approval_line}" != "" ]; then
APPROVALS=$(echo ${approval_line} | python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 32410583 12538138 6836917) APPROVALS=$(echo ${approval_line} | python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 32410583 12538138 6836917)
echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
...@@ -2905,11 +2905,11 @@ function summary_check_problems() { ...@@ -2905,11 +2905,11 @@ function summary_check_problems() {
function reuse_so_cache() { function reuse_so_cache() {
get_html="https://api.github.com/repos/PaddlePaddle/Paddle" get_html="https://api.github.com/repos/PaddlePaddle/Paddle"
curl -X GET ${get_html}/commits >tmp.txt curl -X GET ${get_html}/commits -H "authorization: token ${GITHUB_API_TOKEN}" >tmp.txt
merge_commit=`grep "sha" tmp.txt| awk -F \" 'NR==1{print $(NF-1)}'| sed 's# ##g'` merge_commit=`grep "sha" tmp.txt| awk -F \" 'NR==1{print $(NF-1)}'| sed 's# ##g'`
curl -X GET ${get_html}/commits/${merge_commit} >tmp.txt curl -X GET ${get_html}/commits/${merge_commit} -H "authorization: token ${GITHUB_API_TOKEN}" >tmp.txt
merge_pr=`grep -oP -m 1 '(#[0-9]*)' tmp.txt| sed 's/#//g'` merge_pr=`grep -oP -m 1 '(#[0-9]*)' tmp.txt| sed 's/#//g'`
curl -X GET ${get_html}/pulls/${merge_pr}/commits >tmp.txt curl -X GET ${get_html}/pulls/${merge_pr}/commits -H "authorization: token ${GITHUB_API_TOKEN}" >tmp.txt
pr_commit=`grep "sha" tmp.txt |tail -3|head -1|awk -F : '{print $NF}'|sed 's#"##g'|sed 's#,##g'| sed 's# ##g'` pr_commit=`grep "sha" tmp.txt |tail -3|head -1|awk -F : '{print $NF}'|sed 's#"##g'|sed 's#,##g'| sed 's# ##g'`
set +e set +e
wget -q https://xly-devops.bj.bcebos.com/PR/Paddle/${merge_pr}/${pr_commit}/workspace/Paddle/build/proto_so.tar.gz wget -q https://xly-devops.bj.bcebos.com/PR/Paddle/${merge_pr}/${pr_commit}/workspace/Paddle/build/proto_so.tar.gz
...@@ -3003,7 +3003,7 @@ function check_coverage_build() { ...@@ -3003,7 +3003,7 @@ function check_coverage_build() {
set +x set +x
if [ ${diff_coverage_build_size} -gt 3 ]; then if [ ${diff_coverage_build_size} -gt 3 ]; then
approval_line=`curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000` approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 29832297 6836917 43953930` APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 29832297 6836917 43953930`
echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
if [ "${APPROVALS}" == "FALSE" ]; then if [ "${APPROVALS}" == "FALSE" ]; then
......
...@@ -20,7 +20,7 @@ if [ -z ${BRANCH} ]; then ...@@ -20,7 +20,7 @@ if [ -z ${BRANCH} ]; then
fi fi
PADDLE_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}")/../" && pwd )" PADDLE_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}")/../" && pwd )"
approval_line=`curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000` approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
failed_num=0 failed_num=0
echo_list=() echo_list=()
......
...@@ -71,7 +71,7 @@ API_FILES=("CMakeLists.txt" ...@@ -71,7 +71,7 @@ API_FILES=("CMakeLists.txt"
"paddle/fluid/eager/backward.h" "paddle/fluid/eager/backward.h"
) )
approval_line=`curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000` approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
git_files=`git diff --numstat upstream/$BRANCH| wc -l` git_files=`git diff --numstat upstream/$BRANCH| wc -l`
git_count=`git diff --numstat upstream/$BRANCH| awk '{sum+=$1}END{print sum}'` git_count=`git diff --numstat upstream/$BRANCH| awk '{sum+=$1}END{print sum}'`
failed_num=0 failed_num=0
......
...@@ -24,7 +24,7 @@ class PRChecker(object): ...@@ -24,7 +24,7 @@ class PRChecker(object):
""" PR Checker. """ """ PR Checker. """
def __init__(self): def __init__(self):
self.github = Github(timeout=60) self.github = Github(os.getenv('GITHUB_API_TOKEN'), timeout=60)
self.repo = None self.repo = None
def check(self, filename, msg): def check(self, filename, msg):
......
...@@ -307,7 +307,7 @@ function gpu_op_benchmark { ...@@ -307,7 +307,7 @@ function gpu_op_benchmark {
# The PR will pass quickly when get approval from specific person. # The PR will pass quickly when get approval from specific person.
# Xreki 12538138, luotao1 6836917, ZzSean 32410583 # Xreki 12538138, luotao1 6836917, ZzSean 32410583
set +x set +x
approval_line=$(curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000) approval_line=$(curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000)
if [ -n "${approval_line}" ]; then if [ -n "${approval_line}" ]; then
APPROVALS=$(echo ${approval_line} | python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 32410583 12538138 6836917) APPROVALS=$(echo ${approval_line} | python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 32410583 12538138 6836917)
LOG "[INFO] current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" LOG "[INFO] current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
......
...@@ -30,7 +30,8 @@ def get_pull(pull_id): ...@@ -30,7 +30,8 @@ def get_pull(pull_id):
Returns: Returns:
github.PullRequest.PullRequest: The pull request. github.PullRequest.PullRequest: The pull request.
""" """
github = Github(timeout=60) token = os.getenv('GITHUB_API_TOKEN')
github = Github(token, timeout=60)
repo = github.get_repo('PaddlePaddle/Paddle') repo = github.get_repo('PaddlePaddle/Paddle')
pull = repo.get_pull(pull_id) pull = repo.get_pull(pull_id)
......
...@@ -32,7 +32,8 @@ def get_pull(pull_id): ...@@ -32,7 +32,8 @@ def get_pull(pull_id):
Returns: Returns:
github.PullRequest.PullRequest github.PullRequest.PullRequest
""" """
github = Github(timeout=60) token = os.getenv('GITHUB_API_TOKEN')
github = Github(token, timeout=60)
idx = 1 idx = 1
while idx < 4: while idx < 4:
try: try:
......
...@@ -24,6 +24,8 @@ import os ...@@ -24,6 +24,8 @@ import os
from github import Github from github import Github
token = os.getenv('GITHUB_API_TOKEN')
def get_pull(pull_id): def get_pull(pull_id):
""" """
...@@ -33,7 +35,7 @@ def get_pull(pull_id): ...@@ -33,7 +35,7 @@ def get_pull(pull_id):
Returns: Returns:
github.PullRequest.PullRequest github.PullRequest.PullRequest
""" """
github = Github(timeout=60) github = Github(token, timeout=60)
repo = github.get_repo('PaddlePaddle/Paddle') repo = github.get_repo('PaddlePaddle/Paddle')
pull = repo.get_pull(pull_id) pull = repo.get_pull(pull_id)
......
...@@ -35,7 +35,7 @@ class PRChecker(object): ...@@ -35,7 +35,7 @@ class PRChecker(object):
""" PR Checker. """ """ PR Checker. """
def __init__(self): def __init__(self):
self.github = Github(timeout=60) self.github = Github(os.getenv('GITHUB_API_TOKEN'), timeout=60)
self.repo = self.github.get_repo('PaddlePaddle/Paddle') self.repo = self.github.get_repo('PaddlePaddle/Paddle')
self.py_prog_oneline = re.compile('\d+\|\s*#.*') self.py_prog_oneline = re.compile('\d+\|\s*#.*')
self.py_prog_multiline_a = re.compile('\d+\|\s*r?""".*?"""', re.DOTALL) self.py_prog_multiline_a = re.compile('\d+\|\s*r?""".*?"""', re.DOTALL)
......
...@@ -319,7 +319,7 @@ function gpu_op_benchmark { ...@@ -319,7 +319,7 @@ function gpu_op_benchmark {
# The PR will pass quickly when get approval from specific person. # The PR will pass quickly when get approval from specific person.
# Xreki 12538138, luotao1 6836917, ZzSean 32410583 # Xreki 12538138, luotao1 6836917, ZzSean 32410583
set +x set +x
approval_line=$(curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000) approval_line=$(curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000)
if [ -n "${approval_line}" ]; then if [ -n "${approval_line}" ]; then
APPROVALS=$(echo ${approval_line} | python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 32410583 12538138 6836917) APPROVALS=$(echo ${approval_line} | python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 32410583 12538138 6836917)
LOG "[INFO] current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" LOG "[INFO] current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
......
...@@ -15,15 +15,16 @@ ...@@ -15,15 +15,16 @@
set -e set -e
set +x set +x
export PADDLE_ROOT="$(cd "$PWD/../" && pwd )" export PADDLE_ROOT="$(cd "$PWD/../" && pwd )"
GITHUB_API_TOKEN=$GITHUB_API_TOKEN
GIT_PR_ID=$AGILE_PULL_ID GIT_PR_ID=$AGILE_PULL_ID
BRANCH=$BRANCH BRANCH=$BRANCH
if [ "${GIT_PR_ID}" == "" ];then if [ "${GITHUB_API_TOKEN}" == "" ] || [ "${GIT_PR_ID}" == "" ];then
exit 0 exit 0
fi fi
unittest_spec_diff=$(cat $PADDLE_ROOT/deleted_ut | sed 's/^/ - /g') unittest_spec_diff=$(cat $PADDLE_ROOT/deleted_ut | sed 's/^/ - /g')
if [ "$unittest_spec_diff" != "" ]; then if [ "$unittest_spec_diff" != "" ]; then
approval_line=`curl https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000` approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 22165420 52485244 32428676 45041955` APPROVALS=`echo ${approval_line}|python ${PADDLE_ROOT}/tools/check_pr_approval.py 1 22165420 52485244 32428676 45041955`
echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}" echo "current pr ${GIT_PR_ID} got approvals: ${APPROVALS}"
if [ "${APPROVALS}" == "FALSE" ]; then if [ "${APPROVALS}" == "FALSE" ]; then
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册