From c2c3da4ef1fe890cd4b86f5f89e33f61f7fce9ba Mon Sep 17 00:00:00 2001 From: sbertix Date: Tue, 11 May 2021 16:41:13 +0200 Subject: [PATCH] ci(actions): update `release.yml` --- .github/workflows/release.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5c45782..43fd82f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,18 +25,19 @@ jobs: run: | git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.name "github-actions" + git fetch --all # rebase `bugfixes`. - name: Rebase `bugfixes` run: | - git checkout -b bugfixes origin/bugfixes - git rebase origin/main + git checkout bugfixes + git rebase main git push origin bugfixes --force-with-lease continue-on-error: true # rebase `development`. - name: Rebase `development` run: | - git checkout -b development origin/development - git rebase origin/main + git checkout development + git rebase main git push origin development --force-with-lease continue-on-error: true