Skip to content
This repository was archived by the owner on Aug 6, 2021. It is now read-only.

Commit 725270e

Browse files
authored
Merge pull request #44 from thepwagner/filter-before-update
filter before feedback
2 parents ae5fca1 + b9f8522 commit 725270e

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

actions/updateaction/repositorydispatch.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,27 @@ func (h *handler) repoDispatchActionUpdate(ctx context.Context, evt *github.Repo
3939
baseBranch := evt.GetRepo().GetDefaultBranch()
4040
branchName := h.branchNamer.Format(baseBranch, update)
4141

42+
logrus.WithFields(logrus.Fields{
43+
"path": update.Path,
44+
"version": update.Next,
45+
"branch": branchName,
46+
"feedback_owner": payload.Feedback.Owner,
47+
"feedback_name": payload.Feedback.Name,
48+
"feedback_issue": payload.Feedback.IssueNumber,
49+
}).Debug("applying update from repository")
50+
r, err := h.repo()
51+
if err != nil {
52+
return fmt.Errorf("getting Repo: %w", err)
53+
}
54+
repoUpdater, err := h.repoUpdater(r)
55+
if err != nil {
56+
return fmt.Errorf("getting RepoUpdater: %w", err)
57+
}
58+
if payload.Updater != "" && repoUpdater.Updater.Name() != payload.Updater {
59+
logrus.WithField("updater", payload.Updater).Info("skipping event for other updaters")
60+
return nil
61+
}
62+
4263
var success bool
4364
if payload.Feedback.IssueNumber != 0 {
4465
defer func() {
@@ -72,27 +93,6 @@ func (h *handler) repoDispatchActionUpdate(ctx context.Context, evt *github.Repo
7293
}()
7394
}
7495

75-
logrus.WithFields(logrus.Fields{
76-
"path": update.Path,
77-
"version": update.Next,
78-
"branch": branchName,
79-
"feedback_owner": payload.Feedback.Owner,
80-
"feedback_name": payload.Feedback.Name,
81-
"feedback_issue": payload.Feedback.IssueNumber,
82-
}).Debug("applying update from repository")
83-
r, err := h.repo()
84-
if err != nil {
85-
return fmt.Errorf("getting Repo: %w", err)
86-
}
87-
repoUpdater, err := h.repoUpdater(r)
88-
if err != nil {
89-
return fmt.Errorf("getting RepoUpdater: %w", err)
90-
}
91-
if payload.Updater != "" && repoUpdater.Updater.Name() != payload.Updater {
92-
logrus.WithField("updater", payload.Updater).Info("skipping event for other updaters")
93-
return nil
94-
}
95-
9696
ug := updater.NewUpdateGroup("", update)
9797
if err := repoUpdater.Update(ctx, baseBranch, branchName, ug); err != nil {
9898
return err

0 commit comments

Comments
 (0)