Skip to content

Commit 79e9b8a

Browse files
committed
Open mergeback PR last
This reduces the likelihood of publishing a tag but not a release.
1 parent ba454b8 commit 79e9b8a

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/post-release-mergeback.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,6 @@ jobs:
131131
cat $PARTIAL_CHANGELOG
132132
echo "::endgroup::"
133133
134-
- name: Create mergeback branch and PR
135-
if: ${{ steps.check.outputs.exists != 'true' && endsWith(github.ref_name, steps.getVersion.outputs.latest_release_branch) }}
136-
uses: ./.github/actions/prepare-mergeback-branch
137-
with:
138-
base: "${{ env.BASE_BRANCH }}"
139-
head: "${{ env.HEAD_BRANCH }}"
140-
branch: "${{ steps.getVersion.outputs.newBranch }}"
141-
version: "${{ steps.getVersion.outputs.version }}"
142-
token: "${{ secrets.GITHUB_TOKEN }}"
143-
144134
- name: Generate token
145135
uses: actions/[email protected]
146136
id: app-token
@@ -161,3 +151,13 @@ jobs:
161151
--latest=false \
162152
--title "$VERSION" \
163153
--notes-file "$PARTIAL_CHANGELOG"
154+
155+
- name: Create mergeback branch and PR
156+
if: ${{ endsWith(github.ref_name, steps.getVersion.outputs.latest_release_branch) }}
157+
uses: ./.github/actions/prepare-mergeback-branch
158+
with:
159+
base: "${{ env.BASE_BRANCH }}"
160+
head: "${{ env.HEAD_BRANCH }}"
161+
branch: "${{ steps.getVersion.outputs.newBranch }}"
162+
version: "${{ steps.getVersion.outputs.version }}"
163+
token: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)