diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2026-03-27 07:36:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-27 07:36:28 -0400 |
| commit | 5cce86ed4d835a93efd05c35d92d3bbcb653fa9e (patch) | |
| tree | 41e6007c8d62c17d1c888fb13761dff37723ed97 /.github/workflows | |
| parent | chore: update generated annotations (diff) | |
| download | nvim-lspconfig-5cce86ed4d835a93efd05c35d92d3bbcb653fa9e.tar nvim-lspconfig-5cce86ed4d835a93efd05c35d92d3bbcb653fa9e.tar.gz nvim-lspconfig-5cce86ed4d835a93efd05c35d92d3bbcb653fa9e.tar.bz2 nvim-lspconfig-5cce86ed4d835a93efd05c35d92d3bbcb653fa9e.tar.lz nvim-lspconfig-5cce86ed4d835a93efd05c35d92d3bbcb653fa9e.tar.xz nvim-lspconfig-5cce86ed4d835a93efd05c35d92d3bbcb653fa9e.tar.zst nvim-lspconfig-5cce86ed4d835a93efd05c35d92d3bbcb653fa9e.zip | |
fix(ci): retry generator jobs #4359
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.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/docgen.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/gen-annotations.yml | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/.github/workflows/docgen.yml b/.github/workflows/docgen.yml index 3a860283..789ce2c5 100644 --- a/.github/workflows/docgen.yml +++ b/.github/workflows/docgen.yml @@ -30,4 +30,11 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add doc/configs.md doc/configs.txt # Only commit and push if we have changes - git diff --quiet && git diff --staged --quiet || (git commit -m "${COMMIT_MSG}"; git push) + git diff --quiet && git diff --staged --quiet || ( + git commit -m "${COMMIT_MSG}" + for i in 1 2 3; do + git pull --rebase && git push && break + echo "Push failed (attempt $i), retrying..." + sleep 5 + done + ) diff --git a/.github/workflows/gen-annotations.yml b/.github/workflows/gen-annotations.yml index 13c5fdfc..1da7298c 100644 --- a/.github/workflows/gen-annotations.yml +++ b/.github/workflows/gen-annotations.yml @@ -37,4 +37,11 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add README.md git add -A lua/lspconfig/types - git diff --quiet && git diff --staged --quiet || (git commit -m "${COMMIT_MSG}"; git push) + git diff --quiet && git diff --staged --quiet || ( + git commit -m "${COMMIT_MSG}" + for i in 1 2 3; do + git pull --rebase && git push && break + echo "Push failed (attempt $i), retrying..." + sleep 5 + done + ) |
