Skip to content

Commit

Permalink
Fix actions workflow branches match bug (#22724)
Browse files Browse the repository at this point in the history
caused by #22680 

`pushPayload.Ref` and `prPayload.PullRequest.Base.Ref` have the format
like `refs/heads/<branch_name>`, so we need to trim the prefix before
comparing.
  • Loading branch information
lunny authored Feb 2, 2023
1 parent 98770d3 commit 368d436
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions modules/actions/workflows.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ func DetectWorkflows(commit *git.Commit, triggedEvent webhook_module.HookEventTy
if evt.Name != triggedEvent.Event() {
continue
}

if detectMatched(commit, triggedEvent, payload, evt) {
workflows[entry.Name()] = content
}
Expand Down Expand Up @@ -105,8 +104,9 @@ func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType
for cond, vals := range evt.Acts {
switch cond {
case "branches", "tags":
refShortName := git.RefName(pushPayload.Ref).ShortName()
for _, val := range vals {
if glob.MustCompile(val, '/').Match(pushPayload.Ref) {
if glob.MustCompile(val, '/').Match(refShortName) {
matchTimes++
break
}
Expand Down Expand Up @@ -160,8 +160,9 @@ func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType
}
}
case "branches":
refShortName := git.RefName(prPayload.PullRequest.Base.Ref).ShortName()
for _, val := range vals {
if glob.MustCompile(val, '/').Match(prPayload.PullRequest.Base.Ref) {
if glob.MustCompile(val, '/').Match(refShortName) {
matchTimes++
break
}
Expand Down

0 comments on commit 368d436

Please sign in to comment.