diff --git a/.github/workflows/CheckPRTemplate.yml b/.github/workflows/CheckPRTemplate.yml index 91ba5dc31..afdf492fc 100644 --- a/.github/workflows/CheckPRTemplate.yml +++ b/.github/workflows/CheckPRTemplate.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - develop - - 'release/*' + - 'release/**' jobs: check: diff --git a/.github/workflows/Codestyle-Check.yml b/.github/workflows/Codestyle-Check.yml index 195f4703b..15b871368 100644 --- a/.github/workflows/Codestyle-Check.yml +++ b/.github/workflows/Codestyle-Check.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - develop - - 'release/*' + - 'release/**' jobs: pre-commit: diff --git a/.github/workflows/approve.yml b/.github/workflows/approve.yml index 8d803b470..72f4de2e5 100644 --- a/.github/workflows/approve.yml +++ b/.github/workflows/approve.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - develop - - 'release/*' + - 'release/**' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci_xpu.yml b/.github/workflows/ci_xpu.yml index 874aa257b..987eeb993 100644 --- a/.github/workflows/ci_xpu.yml +++ b/.github/workflows/ci_xpu.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - develop - - 'release/*' + - 'release/**' paths-ignore: - '**.md' - '**.txt' diff --git a/scripts/check_approval.sh b/scripts/check_approval.sh index ee23225e7..169946342 100644 --- a/scripts/check_approval.sh +++ b/scripts/check_approval.sh @@ -75,6 +75,21 @@ if [ "${HAS_SPECULATIVE_DECODING_MODIFY}" != "" ] && [ "${PR_ID}" != "" ]; then check_approval "$echo_line1" 1 freeliuzc Deleter-D fi +if [[ "${BRANCH}" != "develop" ]] && [[ -n "${PR_ID}" ]]; then + pr_info=$(curl -H "Authorization: token ${GITHUB_TOKEN}" \ + https://api.github.com/repos/PaddlePaddle/FastDeploy/pulls/${PR_ID}) + + pr_title=$(echo "$pr_info" | jq -r '.title') + + has_cp_tag=$(echo "$pr_title" | grep -o "\[Cherry-Pick\]" || true) + has_pr_number=$(echo "$pr_title" | grep -oE "#[0-9]{2,6}" || true) + + if [[ -z "$has_cp_tag" ]] || [[ -z "$has_pr_number" ]]; then + echo_line="Cherry-Pick PR must come from develop and the title must contain [Cherry-Pick] and the original develop PR number (e.g., #5010). Approval required from FastDeploy RD: qingqing01(dangqingqing), Jiang-Jia-Jun(jiangjiajun), heavengate(dengkaipeng), yuanlehome(liuyuanle), hong19860320(hongming)." + check_approval "$echo_line" 1 qingqing01 Jiang-Jia-Jun heavengate yuanlehome hong19860320 + fi +fi + if [ -n "${echo_list}" ];then echo "****************" echo -e "${echo_list[@]}" diff --git a/scripts/run_ci_xpu.sh b/scripts/run_ci_xpu.sh index f4c217b35..2f9c29f64 100644 --- a/scripts/run_ci_xpu.sh +++ b/scripts/run_ci_xpu.sh @@ -44,7 +44,8 @@ echo "uninstall org" python -m pip uninstall paddlepaddle-xpu -y python -m pip uninstall fastdeploy-xpu -y -python -m pip install paddlepaddle-xpu -i https://www.paddlepaddle.org.cn/packages/nightly/xpu-p800/ +# python -m pip install paddlepaddle-xpu -i https://www.paddlepaddle.org.cn/packages/nightly/xpu-p800/ +python -m pip install https://paddle-whl.bj.bcebos.com/nightly/xpu-p800/paddlepaddle-xpu/paddlepaddle_xpu-3.3.0.dev20251123-cp310-cp310-linux_x86_64.whl echo "build whl" bash custom_ops/xpu_ops/download_dependencies.sh develop