Commit 11d7cf7
committed
fix(ci): retry generator jobs
Problem:
docgen fails if gen-annotations pushes before it:
[master c2804a4] docs: update configs.md skip-checks: true
2 files changed, 24 insertions(+), 20 deletions(-)
To https://github.com/neovim/nvim-lspconfig
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/neovim/nvim-lspconfig'
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
Solution:
If push fails, rebase and retry. The two workflows touch disjoint files
so the rebase should alway resolve.1 parent 027861f commit 11d7cf7
2 files changed
Lines changed: 16 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
0 commit comments