Skip to content

Conversation

@matthewdale
Copy link
Collaborator

The condition that should skip the merge-up steps for the Golang release does not correctly skip the steps, which can lead to artifacts incorrectly being pushed to release branches.

See an example release job that should not have pushed any changes: https://github.com/mongodb/mongo-go-driver/actions/runs/18732543507

@matthewdale matthewdale requested a review from alcaeus October 24, 2025 00:05
Copy link
Collaborator

@alcaeus alcaeus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes LGTM. I suggested changes to exclude merge-ups from branches in the ignored list, as the merge-up automation only uses this to exclude target branches, not the source branch.

push_tag: ${{ inputs.push_changes }}
- name: "Determine branch to merge up to"
if: ${{ inputs.push_changes }}
if: ${{ inputs.push_changes == 'true' }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if: ${{ inputs.push_changes == 'true' }}
if: ${{ inputs.push_changes == 'true' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) }}

ignoredBranches: ${{ inputs.ignored_branches }}
- name: "Manually merge up changes"
if: ${{ inputs.push_changes && steps.get-next-branch.outputs.hasNextBranch }}
if: ${{ inputs.push_changes == 'true' && steps.get-next-branch.outputs.hasNextBranch }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if: ${{ inputs.push_changes == 'true' && steps.get-next-branch.outputs.hasNextBranch }}
if: ${{ inputs.push_changes == 'true' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) && steps.get-next-branch.outputs.hasNextBranch }}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants