You need to sign in or sign up before continuing.
未验证 提交 61443a0e 编写于 作者: T tianshuo78520a 提交者: GitHub

Change CI-Build build develop (#39863)

上级 23aa7a36
...@@ -20,6 +20,7 @@ build/ ...@@ -20,6 +20,7 @@ build/
build_doc/ build_doc/
*.user *.user
*.tmp *.tmp
*.pyc
.vscode .vscode
.idea .idea
......
...@@ -2592,22 +2592,6 @@ function reuse_so_cache() { ...@@ -2592,22 +2592,6 @@ function reuse_so_cache() {
fi fi
} }
function find_temporary_files() {
set +x
jsonData=`curl \
-H "Authorization: token ${GITHUB_API_TOKEN}"\
-H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/files`
result=`echo ${jsonData}|python ${PADDLE_ROOT}/tools/check_file_suffix.py`
if [ ${#result} -gt 0 ]
then
echo ${result}
exit 65
fi
}
function trt_convert_test() { function trt_convert_test() {
set +e set +e
cd ${PADDLE_ROOT} cd ${PADDLE_ROOT}
...@@ -2638,10 +2622,19 @@ function build_pr_and_develop() { ...@@ -2638,10 +2622,19 @@ function build_pr_and_develop() {
rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt
rm -rf ${PADDLE_ROOT}/build/third_party rm -rf ${PADDLE_ROOT}/build/third_party
fi fi
git checkout -b develop_base_pr upstream/$BRANCH
cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number} git fetch upstream develop
generate_api_spec "$1" "DEV" dev_commit=`git log -1|head -1|awk '{print $2}'`
mkdir ${PADDLE_ROOT}/build/dev_whl && cp ${PADDLE_ROOT}/build/python/dist/*.whl ${PADDLE_ROOT}/build/dev_whl dev_url="https://xly-devops.bj.bcebos.com/PR/build_whl/0/${dev_commit}/paddlepaddle_gpu-0.0.0-cp37-cp37m-linux_x86_64.whl"
url_return=`curl -s -m 5 -IL ${dev_url} |awk 'NR==1{print $2}'`
if [ "$url_return" == '200' ];then
mkdir ${PADDLE_ROOT}/build/dev_whl && wget -P ${PADDLE_ROOT}/build/dev_whl ${dev_url}
else
git checkout -b develop_base_pr upstream/$BRANCH
cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
generate_api_spec "$1" "DEV"
mkdir ${PADDLE_ROOT}/build/dev_whl && cp ${PADDLE_ROOT}/build/python/dist/*.whl ${PADDLE_ROOT}/build/dev_whl
fi
} }
function build_develop() { function build_develop() {
...@@ -2669,7 +2662,6 @@ function main() { ...@@ -2669,7 +2662,6 @@ function main() {
set +e set +e
check_style_info=$(check_style) check_style_info=$(check_style)
check_style_code=$? check_style_code=$?
find_temporary_files
generate_upstream_develop_api_spec ${PYTHON_ABI:-""} ${parallel_number} generate_upstream_develop_api_spec ${PYTHON_ABI:-""} ${parallel_number}
cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number} cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
check_sequence_op_unittest check_sequence_op_unittest
...@@ -2689,7 +2681,6 @@ function main() { ...@@ -2689,7 +2681,6 @@ function main() {
;; ;;
build_and_check_cpu) build_and_check_cpu)
set +e set +e
find_temporary_files
generate_upstream_develop_api_spec ${PYTHON_ABI:-""} ${parallel_number} generate_upstream_develop_api_spec ${PYTHON_ABI:-""} ${parallel_number}
cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number} cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
check_sequence_op_unittest check_sequence_op_unittest
......
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import sys
import json
def check_suffix():
suffix_arr = [".pyc"]
json_buff = ""
for line in sys.stdin:
json_buff = "".join([json_buff, line])
json_obj = json.loads(json_buff)
if not isinstance(json_obj, list):
print('Json String Should be a list Object\n')
return
files_with_invalid_suffix = []
for i in range(len(json_obj)):
file_name = json_obj[i]["filename"]
if file_name == None:
continue
for suffix in suffix_arr:
if file_name.endswith(suffix):
files_with_invalid_suffix.append(file_name)
break
if len(files_with_invalid_suffix) != 0:
print('Error: Find file(s): [\n')
for i in range(len(files_with_invalid_suffix)):
print('\t' + files_with_invalid_suffix[i] + '\n')
print(
' ] end(s) with invalid suffix, Please check if these files are temporary.'
)
if __name__ == "__main__":
check_suffix()
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册