Skip to content

Commit 6d01023

Browse files
YaraslauSupanitskijbpratt
authored andcommitted
fix logic for update action into MR and flag never
we set it on 1st place because the more important type of hook than flag approved or not. Also update action often came with opened state.
1 parent 838b382 commit 6d01023

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public static MergeRequestHookTriggerHandler newMergeRequestHookTriggerHandler(b
3434

3535
TriggerConfigChain chain = new TriggerConfigChain();
3636
chain
37+
.acceptOnlyIf(triggerOpenMergeRequest != TriggerOpenMergeRequest.never, of(State.opened, State.updated), of(Action.update))
3738
.acceptOnlyIf(triggerOnApprovedMergeRequest, null, of(Action.approved))
3839
.acceptIf(triggerOnMergeRequest, of(State.opened, State.reopened), null)
3940
.acceptIf(triggerOnAcceptedMergeRequest, null, of(Action.merge))
4041
.acceptIf(triggerOnClosedMergeRequest, null, of(Action.close))
4142
.acceptIf(triggerOnClosedMergeRequest, of(State.closed), null)
42-
.acceptIf(triggerOpenMergeRequest != TriggerOpenMergeRequest.never, of(State.updated), null)
4343
;
4444

4545
Set<String> labelsThatForcesBuildIfAddedSet = Stream.of(split(trimToEmpty(labelsThatForcesBuildIfAdded), ",")).collect(toSet());

0 commit comments

Comments
 (0)