From 4f220ffca1785fb2579fea3fcd39cdf8ccee22a1 Mon Sep 17 00:00:00 2001 From: Meier Lukas Date: Fri, 21 Feb 2025 19:31:02 +0100 Subject: [PATCH] ci: fix rebase for dev not working on release (#2392) --- .github/workflows/deployment-docker-image.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deployment-docker-image.yml b/.github/workflows/deployment-docker-image.yml index ab7ef7e1b..fb2fa4fcd 100644 --- a/.github/workflows/deployment-docker-image.yml +++ b/.github/workflows/deployment-docker-image.yml @@ -96,10 +96,11 @@ jobs: run: | git config user.name "Releases Homarr" git config user.email "175486441+homarr-releases[bot]@users.noreply.github.com" + git remote set-url origin https://x-access-token:${{ steps.obtainToken.outputs.token }}@github.com/${{ github.repository }}.git git fetch origin dev git checkout dev git pull origin dev - git merge ${{ github.ref_name }} + git rebase ${{ github.ref_name }} git push origin dev deploy: name: Deploy docker image