From c79cb6a2dbb3a09814ff80094010881c4537cb6d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 28 Nov 2019 15:24:32 +0000 Subject: [PATCH] workflows/apidoc: try to rebase before pushing. This avoids failures when you have two `master` builds running at once. --- .github/workflows/apidoc.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/apidoc.yml b/.github/workflows/apidoc.yml index 0507ed7c53..4ed55573ff 100644 --- a/.github/workflows/apidoc.yml +++ b/.github/workflows/apidoc.yml @@ -34,8 +34,10 @@ jobs: # commit and push generated files git add docs - + if ! git diff --exit-code HEAD -- docs; then git commit -m 'docs: update from Homebrew/brew push' docs + git fetch + git rebase origin/master git push fi