ci: update code

Signed-off-by: David Mandy <smallprogramzhusir@gmail.com>

Author: smallprogram

.github/workflows/Build_Multi_Platform(V6).yml

@@ -135,21 +135,36 @@ jobs:
             git config user.email "smallprogram@foxmail.com"
             git commit -m "Configuration: update code for ${{ matrix.source_code_platform }}"
 
-            git checkout ${{ github.ref_name }}
-            git fetch origin
-            git reset --hard origin/${{ github.ref_name }}
-
-            git checkout temp-${{ matrix.source_code_platform }}
-            git merge origin/${{ github.ref_name }} --no-ff --strategy-option theirs --no-edit || {
-              echo "Merge conflict in temp branch, please resolve manually."
+            MAX_RETRIES=10
+            RETRY_COUNT=0
+            
+            # 循环重试机制解决矩阵并发 Push 冲突
+            while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
+              git checkout ${{ github.ref_name }}
+              git fetch origin ${{ github.ref_name }}
+              git reset --hard origin/${{ github.ref_name }}
+              
+              # 合并当前的临时分支
+              git merge temp-${{ matrix.source_code_platform }} --strategy-option theirs --no-edit
+              
+              if git push origin ${{ github.ref_name }}; then
+                echo "Push successful!"
+                break
+              else
+                echo "Push failed due to concurrent update. Retrying in a few seconds..."
+                git reset --hard HEAD~1
+                RETRY_COUNT=$((RETRY_COUNT+1))
+                sleep $((RANDOM % 5 + 3)) # 随机等待 3-7 秒错开并发
+              fi
+            done
+            
+            if [ $RETRY_COUNT -eq $MAX_RETRIES ]; then
+              echo "Failed to push after $MAX_RETRIES attempts."
               exit 100
-            }
+            fi
 
-            git checkout ${{ github.ref_name }} 
-            git merge temp-${{ matrix.source_code_platform }} --strategy-option theirs --no-edit
-            git push origin ${{ github.ref_name }} --force
-            git branch -d temp-${{ matrix.source_code_platform }} || echo "Local temp-${{ matrix.source_code_platform }} not found"
-            git push origin --delete temp-${{ matrix.source_code_platform }} || echo "Remote temp-${{ matrix.source_code_platform }} not found"
+            # 只删除本地临时分支
+            git branch -D temp-${{ matrix.source_code_platform }} || echo "Local temp branch not found"
           else
             echo "No changes to commit."
           fi
@@ -261,24 +276,43 @@ jobs:
             git config user.name "smallprogram"
             git config user.email "smallprogram@foxmail.com"
             git commit -m "Git Log: update code"
-            git checkout ${{ github.ref_name }}
-            git fetch origin
-            git reset --hard origin/${{ github.ref_name }}
-            git checkout temp-tag-gitlog
-            git merge origin/${{ github.ref_name }} --no-ff --strategy-option theirs --no-edit || { exit 100; }
-            git checkout ${{ github.ref_name }} 
-            git merge temp-tag-gitlog --strategy-option theirs --no-edit
-            git push origin ${{ github.ref_name }} --force
-            git branch -d temp-tag-gitlog || echo "Local temp-tag-gitlog not found"
-            git push origin --delete temp-tag-gitlog || echo "Remote temp-tag-gitlog not found"
+            
+            MAX_RETRIES=10
+            RETRY_COUNT=0
+            
+            while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
+              git checkout ${{ github.ref_name }}
+              git fetch origin ${{ github.ref_name }}
+              git reset --hard origin/${{ github.ref_name }}
+              
+              git merge temp-tag-gitlog --strategy-option theirs --no-edit
+              
+              if git push origin ${{ github.ref_name }}; then
+                echo "Push successful!"
+                break
+              else
+                echo "Push failed. Retrying..."
+                git reset --hard HEAD~1
+                RETRY_COUNT=$((RETRY_COUNT+1))
+                sleep $((RANDOM % 5 + 3))
+              fi
+            done
+            
+            if [ $RETRY_COUNT -eq $MAX_RETRIES ]; then
+              echo "Failed to push git log after $MAX_RETRIES attempts."
+              exit 100
+            fi
+            
+            # 只删除本地临时分支
+            git branch -D temp-tag-gitlog || echo "Local temp-tag-gitlog not found"
           else
             echo "No changes to commit."
           fi
 
   job_compile_and_upload:
     needs: [job_init, job_source_init, job_generate_release_tag]
     runs-on: ${{ matrix.value.OS }}
-    if: ${{ always() && !cancelled() }} 
+    if: ${{ !cancelled() && needs.job_source_init.result == 'success' && needs.job_generate_release_tag.result == 'success' }}
     strategy:
       fail-fast: false
       matrix:
@@ -673,7 +707,7 @@ jobs:
 
   job_organize_tags:
     needs: [job_init, job_source_init, job_generate_release_tag, job_compile_and_upload]
-    if: ${{ always() && !cancelled() }} 
+    if: ${{ !cancelled() && needs.job_source_init.result == 'success' && needs.job_generate_release_tag.result == 'success' }}
     runs-on: ubuntu-latest
     name: Organize-Release-Tags
     outputs: