From e3c6d8c1377179d903a3726da2f7816315efaf3a Mon Sep 17 00:00:00 2001 From: Ethan Dye Date: Sun, 16 May 2021 20:20:56 -0600 Subject: [PATCH] Attempt to fix rebase action Signed-off-by: Ethan Dye --- .github/workflows/rebase-action.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rebase-action.yml b/.github/workflows/rebase-action.yml index 6fb61fe..f3709fb 100644 --- a/.github/workflows/rebase-action.yml +++ b/.github/workflows/rebase-action.yml @@ -8,6 +8,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Import GPG key uses: crazy-max/ghaction-import-gpg@v3 with: @@ -19,10 +21,9 @@ jobs: run: | git config --global user.name 'Ethan Dye' git config --global user.email 'mrtops03@gmail.com' - git fetch origin - git checkout origin/openHAB - git rebase origin/main + git checkout openHAB + git rebase main git push --force-with-lease - git checkout origin/openHAB2 - git rebase origin/main + git checkout openHAB2 + git rebase main git push --force-with-lease