Skip to content

Commit d49b4af

Browse files
committed
Apply feedback from code review
1 parent 26f289b commit d49b4af

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ jobs:
5050
exit 1
5151
5252
# For non-patch releases (A.B.C where C == 0), we expect the release to
53-
# be triggered from the A.x maintenance branch
53+
# be triggered from the A.x maintenance branch or A.x development branch
5454
- name: "Fail if non-patch release is created from wrong release branch"
5555
if: ${{ endsWith(inputs.version, '.0') && env.RELEASE_BRANCH != github.ref_name && env.DEV_BRANCH != github.ref_name }}
5656
run: |
5757
echo '❌ Release failed due to branch mismatch: expected ${{ inputs.version }} to be released from ${{ env.RELEASE_BRANCH }} or ${{ env.DEV_BRANCH }}, got ${{ github.ref_name }}' >> $GITHUB_STEP_SUMMARY
5858
exit 1
5959
60-
# If a non-patch release is created from a branch other than its
61-
# maintenance branch, create that branch from the current one and push it
62-
- name: "Create new and push release branch for non-patch release"
63-
if: ${{ endsWith(inputs.version, '.0') && env.RELEASE_BRANCH != github.ref_name }}
60+
# If a non-patch release is created from its A.x development branch,
61+
# create the A.B maintenance branch from the current one and push it
62+
- name: "Create and push new release branch for non-patch release"
63+
if: ${{ endsWith(inputs.version, '.0') && env.DEV_BRANCH == github.ref_name }}
6464
run: |
6565
echo '🆕 Creating new release branch ${RELEASE_BRANCH} from ${{ github.ref_name }}' >> $GITHUB_STEP_SUMMARY
6666
git checkout -b ${RELEASE_BRANCH}

0 commit comments

Comments
 (0)