Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH Actions: minor tweak to merge conflict workflow #190

Merged
merged 1 commit into from
Dec 26, 2023

Conversation

jrfnl
Copy link
Member

@jrfnl jrfnl commented Dec 26, 2023

Description

Follow up on #141 which added the pull_request_target trigger with types to the merge conflict check.

The edited type seems to include changes to the PR labels, which means that the workflow keeps getting cancelled and retriggered on new PRs due to the label workflow running and adding labels, so let's remove the edited type.

Suggested changelog entry

N/A

Follow up on 141 which added the `pull_request_target` trigger with types to the merge conflict check.

The `edited` type seems to include changes to the PR labels, which means that the workflow keeps getting cancelled and retriggered on new PRs due to the label workflow running and adding labels, so let's remove the `edited` type.
@jrfnl jrfnl added this to the 3.x Next milestone Dec 26, 2023
@jrfnl jrfnl merged commit 6be2da7 into master Dec 26, 2023
46 of 47 checks passed
@jrfnl jrfnl deleted the feature/ghactions-merge-conflict-tweak branch December 26, 2023 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant