test=document_fix pull retry (#73376)

swgu98 · web-flow · commit 65a79c41566b · 2025-06-19T16:58:16.000+08:00
diff --git a/.github/workflows/Coverage.yml b/.github/workflows/Coverage.yml
@@ -140,7 +140,7 @@ jobs:
           git checkout test
           echo "Pull upstream $BRANCH"
           source ${{ github.workspace }}/../../../proxy
-          git pull upstream $BRANCH --no-edit
+          bash ci/git_pull.sh $BRANCH
           '
 
       - name: Check bypass
@@ -330,7 +330,7 @@ jobs:
           source ${{ github.workspace }}/../../../proxy
           git checkout test
           echo "Pull upstream develop"
-          git pull upstream $BRANCH --no-edit
+          bash ci/git_pull.sh $BRANCH
           '
 
       - name: Test
diff --git a/.github/workflows/_Distribute-stable.yml b/.github/workflows/_Distribute-stable.yml
@@ -136,7 +136,7 @@ jobs:
           source ${{ github.workspace }}/../../../proxy
           git checkout test
           echo "Pull upstream develop"
-          git pull upstream $BRANCH --no-edit
+          bash ci/git_pull.sh $BRANCH
           '
 
       - name: Check bypass
@@ -324,7 +324,7 @@ jobs:
           git checkout test
           echo "Pull upstream $BRANCH"
           source ${{ github.workspace }}/../../../proxy
-          git pull upstream $BRANCH --no-edit
+          bash ci/git_pull.sh $BRANCH
           '
 
       - name: Test
diff --git a/.github/workflows/_Inference.yml b/.github/workflows/_Inference.yml
@@ -124,7 +124,7 @@ jobs:
           git config pull.rebase false
           git checkout test
           echo "Pull upstream develop"
-          git pull upstream $BRANCH --no-edit
+          bash ci/git_pull.sh $BRANCH
           '
 
       - name: Run build
diff --git a/.github/workflows/_Linux-CPU.yml b/.github/workflows/_Linux-CPU.yml
@@ -105,8 +105,9 @@ jobs:
           git config --global user.email "paddle_ci@example.com"
           git remote add upstream https://github.com/PaddlePaddle/Paddle.git
           source ${{ github.workspace }}/../../../proxy
+          cp ci/git_pull.sh ci/git_pull_copy.sh
           git checkout $BRANCH
-          git pull upstream $BRANCH
+          bash ci/git_pull_copy.sh $BRANCH
           git fetch upstream $BRANCH
           git checkout test
           git merge --no-edit $BRANCH
diff --git a/.github/workflows/_Linux-NPU.yml b/.github/workflows/_Linux-NPU.yml
@@ -49,7 +49,7 @@ jobs:
           git checkout test
           echo "Pull upstream develop"
           source ${{ github.workspace }}/../../../proxy
-          git pull upstream $BRANCH --no-edit
+          bash ci/git_pull.sh $BRANCH
 
       - name: Determine the runner
         run: |
diff --git a/.github/workflows/_Linux-XPU.yml b/.github/workflows/_Linux-XPU.yml
@@ -122,7 +122,7 @@ jobs:
           git config pull.rebase false
           git checkout test
           echo "Pull upstream develop or target branch"
-          git pull upstream $BRANCH --no-edit
+          bash ci/git_pull.sh $BRANCH
           '
 
       - name: Run build
diff --git a/.github/workflows/_Linux-build.yml b/.github/workflows/_Linux-build.yml
@@ -132,8 +132,9 @@ jobs:
           git config --global user.email "paddle_ci@example.com"
           git remote add upstream https://github.com/PaddlePaddle/Paddle.git
           source ${{ github.workspace }}/../../../proxy
+          cp ci/git_pull.sh ci/git_pull_copy.sh
           git checkout $BRANCH
-          git pull upstream $BRANCH
+          bash ci/git_pull_copy.sh $BRANCH
           git fetch upstream $BRANCH
           git checkout test
           git merge --no-edit $BRANCH
diff --git a/.github/workflows/_Mac.yml b/.github/workflows/_Mac.yml
@@ -58,8 +58,9 @@ jobs:
           git config --global user.name "PaddleCI"
           git config --global user.email "paddle_ci@example.com"
           git remote add upstream https://github.com/PaddlePaddle/Paddle.git
+          cp ci/git_pull.sh ci/git_pull_copy.sh
           git checkout $BRANCH
-          git pull upstream $BRANCH
+          bash ci/git_pull_copy.sh $BRANCH
           git fetch upstream $BRANCH
           git checkout test
           git merge --no-edit $BRANCH
diff --git a/.github/workflows/_SOT.yml b/.github/workflows/_SOT.yml
@@ -110,8 +110,9 @@ jobs:
           git config --global user.email "paddle_ci@example.com"
           git remote add upstream https://github.com/PaddlePaddle/Paddle.git
           source ${{ github.workspace }}/../../../proxy
+          cp ci/git_pull.sh ci/git_pull_copy.sh
           git checkout $BRANCH
-          git pull upstream $BRANCH
+          bash ci/git_pull_copy.sh $BRANCH
           git fetch upstream $BRANCH
           git checkout test
           git merge --no-edit $BRANCH
diff --git a/ci/git_pull.sh b/ci/git_pull.sh
@@ -0,0 +1,30 @@
+# Copyright (c) 2025 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
+#
+#     https://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.
+
+BRANCH=$1
+
+MAX_RETRY=5
+n=0
+
+while [ "$n" -lt "$MAX_RETRY" ]; do
+  git pull upstream "$BRANCH" --no-edit && break
+  n=$((n+1))
+  echo "git pull failed, retrying in 5 seconds... ($n/$MAX_RETRY)"
+  sleep 5
+done
+
+if [ "$n" -eq "$MAX_RETRY" ]; then
+  echo "Pull failed after $MAX_RETRY retries"
+  exit 2
+fi

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ jobs:`
`124`	`124`	`git config pull.rebase false`
`125`	`125`	`git checkout test`
`126`	`126`	`echo "Pull upstream develop"`
`127`		`- git pull upstream $BRANCH --no-edit`
	`127`	`+ bash ci/git_pull.sh $BRANCH`
`128`	`128`	`'`
`129`	`129`
`130`	`130`	`- name: Run build`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ jobs:`
`122`	`122`	`git config pull.rebase false`
`123`	`123`	`git checkout test`
`124`	`124`	`echo "Pull upstream develop or target branch"`
`125`		`- git pull upstream $BRANCH --no-edit`
	`125`	`+ bash ci/git_pull.sh $BRANCH`
`126`	`126`	`'`
`127`	`127`
`128`	`128`	`- name: Run build`