jazzymc/homarr
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ci: fix rebase for dev not working on release (#2392)

Browse Source
This commit is contained in:
Meier Lukas
2025-02-21 19:31:02 +01:00
committed by GitHub
parent a54e0783e2
commit 4f220ffca1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/deployment-docker-image.yml vendored
View File

@@ -96,10 +96,11 @@ jobs:
run: | run: |
git config user.name "Releases Homarr" git config user.name "Releases Homarr"
git config user.email "175486441+homarr-releases[bot]@users.noreply.github.com" 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 fetch origin dev
git checkout dev git checkout dev
git pull origin dev git pull origin dev
git merge ${{ github.ref_name }} git rebase ${{ github.ref_name }}
git push origin dev git push origin dev
deploy: deploy:
name: Deploy docker image name: Deploy docker image