Skip to content
This repository was archived by the owner on Feb 3, 2022. It is now read-only.
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public class GithubController {

private static final String GITHUB_WEBOOK_CIDR = "192.30.252.0/22";
private static final String MASTER_REF = "refs/heads/master";
private static final String NOREPLY_DOMAIN = "@users.noreply.github.com";

private final Logger logger = LoggerFactory.getLogger(GithubController.class);
private final SubnetInfo trustedNetwork = new SubnetUtils(GITHUB_WEBOOK_CIDR).getInfo();
Expand Down Expand Up @@ -160,13 +161,19 @@ private List<Commit> getQualifyingCommits(PushEvent event, String defaultMode) {
Set<String> emails = new HashSet<>();

for (Commit commit : event.getCommits()) {
String email = commit.getAuthor().getEmail();

logger.info(commit.getUrl());
if (!emails.contains(commit.getAuthor().getEmail())) {
logger.info("Unique author: "+ commit.getAuthor().getEmail());

if (email.endsWith(NOREPLY_DOMAIN)) {
logger.info("Skipping GitHub noreply author " + email);
} else if (!emails.contains(email)) {
logger.info("Unique author: " + email);

if (isViableMessage(commit.getMessage(), defaultMode)) {
logger.info("Not a merge commit or freebie...");

emails.add(commit.getAuthor().getEmail());
emails.add(email);
commits.add(commit);
}
}
Expand Down