Commit 9870065
committed
ci: Make auto-commit step resilient to concurrent pushes
The stefanzweifel/git-auto-commit-action does not pull or rebase before
pushing (this is a deliberate non-goal upstream). When this workflow
runs concurrently with other actors pushing unrelated changes to main
(e.g. a different folder), the action's internal git push is rejected
as non-fast-forward and the workflow fails — even though the changes
do not conflict.
Switch to skip_push and add a small retry loop that does git pull
--rebase between push attempts, mirroring the pattern already proven
in the EngineeringKiosk/podcast-metadata workflows.1 parent be67057 commit 9870065
1 file changed
Lines changed: 22 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
| 24 | + | |
24 | 25 | | |
| 26 | + | |
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
32 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
0 commit comments