github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-12 15:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MISC] Fix cleanup on PR close|merge

Browse Source
This commit is contained in:
Johannes Batzill 2023-03-17 13:41:10 -07:00
parent 6e398f49a7
commit d4b12cfafa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/services/pullreq/handlers_mergeable.go
View File

@ -73,14 +73,14 @@ func (s *Service) mergeCheckOnReopen(ctx context.Context,
func (s *Service) mergeCheckOnClosed(ctx context.Context, func (s *Service) mergeCheckOnClosed(ctx context.Context,
event *events.Event[*pullreqevents.ClosedPayload], event *events.Event[*pullreqevents.ClosedPayload],
) error { ) error {
return s.deleteMergeRef(ctx, event.Payload.PrincipalID, event.Payload.SourceRepoID, event.Payload.PullReqID) return s.deleteMergeRef(ctx, event.Payload.PrincipalID, event.Payload.SourceRepoID, event.Payload.Number)
} }
// mergeCheckOnMerged deletes the merge ref. // mergeCheckOnMerged deletes the merge ref.
func (s *Service) mergeCheckOnMerged(ctx context.Context, func (s *Service) mergeCheckOnMerged(ctx context.Context,
event *events.Event[*pullreqevents.MergedPayload], event *events.Event[*pullreqevents.MergedPayload],
) error { ) error {
return s.deleteMergeRef(ctx, event.Payload.PrincipalID, event.Payload.SourceRepoID, event.Payload.PullReqID) return s.deleteMergeRef(ctx, event.Payload.PrincipalID, event.Payload.SourceRepoID, event.Payload.Number)
} }
func (s *Service) deleteMergeRef(ctx context.Context, principalID int64, repoID int64, prNum int64) error { func (s *Service) deleteMergeRef(ctx context.Context, principalID int64, repoID int64, prNum int64) error {