generate_formulae.brew.sh_data: fetch/rebase when needed.

Similar change to https://github.com/Homebrew/brew/pull/6791.
2019-12-02 13:22:51 +00:00 · 2019-12-02 13:22:51 +00:00 · 9068085dd2
parent 534435aa51
commit 9068085dd2
1 changed files with 2 additions and 0 deletions
--- a/.github/workflows/generate_formulae.brew.sh_data.yml
+++ b/.github/workflows/generate_formulae.brew.sh_data.yml
@ -37,6 +37,8 @@ jobs:

          if ! git diff --exit-code HEAD -- _data/analytics _data/formula api/formula formula cask; then
            git commit -m "formula: update from ${GITHUB_REPOSITORY} push" _data/analytics _data/formula api/formula formula
+            git fetch
+            git rebase origin/master
            git push
          fi
        env: