diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0929856..197dcdc6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,7 +94,13 @@ jobs: - name: Merge branch and push run: | - git checkout master + parent=$(git show-branch \ + | grep -F '*' \ + | grep -v "$(git rev-parse --abbrev-ref HEAD)" \ + | head -n1 \ + | sed 's/.*\[\(.*\)\].*/\1/' \ + | sed 's/[\^~].*//') + git checkout ${parent} git merge release/${{ env.BUILDVER }} --allow-unrelated-histories git pull && git push && git push --tags