From 42608f19f67ba114ddd1e17ab6c673e51fa03000 Mon Sep 17 00:00:00 2001 From: Patrick Huck Date: Wed, 2 Nov 2022 16:20:33 -0700 Subject: [PATCH] dep ugrade action: add rebase to clean up --- .github/workflows/upgrade-dependencies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upgrade-dependencies.yml b/.github/workflows/upgrade-dependencies.yml index 54e91c76ff..62c9c30bdd 100644 --- a/.github/workflows/upgrade-dependencies.yml +++ b/.github/workflows/upgrade-dependencies.yml @@ -55,6 +55,7 @@ jobs: run: git checkout -b auto-dependency-upgrades git branch -r | grep auto-dependency-upgrades- | xargs -I {} git merge {} + git rebase main git push -f origin auto-dependency-upgrades git branch -r | grep auto-dependency-upgrades- | cut -d/ -f2 | xargs -I {} git push origin :{} - name: Open pull request if needed