Merge pull request 'fix: 修正 CI 並發 fetch 導致 git ref 衝突' (#18) from fix/sentry-composer into master

Reviewed-on: #18
2026-05-28 19:03:13 +00:00
parent cfd0455597 0160d72467
commit 127101adb3
1 changed files with 2 additions and 1 deletions
@@ -12,7 +12,8 @@ jobs:
      - name: Pull latest code
        run: |
          cd /root/myproject/CFDivePlatform
-          git pull
+          flock -w 30 /tmp/cfdive-deploy.lock git fetch origin
+          git reset --hard origin/master

      - name: Install Composer dependencies
        run: |