Skip to content

Commit

Permalink
Attempt to fix rebase action
Browse files Browse the repository at this point in the history
Signed-off-by: Ethan Dye <mrtops03@gmail.com>
  • Loading branch information
ecdye committed May 17, 2021
1 parent fb27d31 commit e3c6d8c
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/rebase-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

0 comments on commit e3c6d8c

Please sign in to comment.