Skip to content

A self-hosted media server and file management system

fix: rebase to current branch not main when updating tags

aminnausin4917ac172323
diff --git a/.github/workflows/ci-docker-release.yml b/.github/workflows/ci-docker-release.yml
index 3f339f1c..fd1d8c54 100644
--- a/.github/workflows/ci-docker-release.yml
+++ b/.github/workflows/ci-docker-release.yml
@@ -117,10 +117,11 @@ jobs:
commit_message: 'chore: bump version to ${{ steps.set_release_info.outputs.TAG }}'
file_pattern: |
VERSION
- - name: Fetch latest main and rebase
+ - name: Fetch latest and rebase onto current branch
run: |
- git fetch origin
- git rebase origin/main
+ CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+ git fetch origin $CURRENT_BRANCH
+ git rebase origin/$CURRENT_BRANCH
- name: Create and push Git tag
if: steps.set_release_info.outputs.TAG != ''
run: |