Skip to content

Commit

Permalink
Use feature/merge-X.Y.Z-tag branch name for PR
Browse files Browse the repository at this point in the history
  • Loading branch information
eg-ayoub committed Dec 3, 2024
1 parent 060ffa3 commit 8135758
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
git push origin ${{ env.RELEASE_TAG }}
- name: Prepare branch to merge ${{ env.RELEASE_TAG }} tag
run: |
git checkout -b release/merge-${{ env.RELEASE_TAG }}-tag origin/development/${{ env.SHORT_VERSION }}
git checkout -b feature/merge-${{ env.RELEASE_TAG }}-tag origin/development/${{ env.SHORT_VERSION }}
git merge ${{ env.RELEASE_TAG }} --no-ff
VERSION_PATCH=${{ env.PATCH_VERSION }}
Expand All @@ -177,15 +177,15 @@ jobs:
git add VERSION
git commit --amend --no-edit
git push --set-upstream origin release/merge-${{ env.RELEASE_TAG }}-tag
git push --set-upstream origin feature/merge-${{ env.RELEASE_TAG }}-tag
- name: Create pull request
uses: actions/github-script@v7
with:
script: |
const pr = await github.rest.pulls.create({
owner: context.repo.owner,
repo: context.repo.repo,
head: "release/merge-${{ env.RELEASE_TAG }}-tag",
head: "feature/merge-${{ env.RELEASE_TAG }}-tag",
base: "development/${{ env.SHORT_VERSION }}",
title: "Merge release tag for ${{ env.RELEASE_TAG }}"
});
Expand Down

0 comments on commit 8135758

Please sign in to comment.