diff --git a/src/main/java/org/hibernate/infra/bot/CheckPullRequestContributionRules.java b/src/main/java/org/hibernate/infra/bot/CheckPullRequestContributionRules.java index e47a271..8770fb8 100644 --- a/src/main/java/org/hibernate/infra/bot/CheckPullRequestContributionRules.java +++ b/src/main/java/org/hibernate/infra/bot/CheckPullRequestContributionRules.java @@ -246,7 +246,7 @@ private boolean shouldCheckPullRequest(PullRequestCheckRunContext context) throw GHUser author = context.pullRequest.getUser(); String title = context.pullRequest.getTitle(); for ( RepositoryConfig.IgnoreConfiguration ignore : ignoredPRConfigurations ) { - if ( ignore.getUser().equals( author.getLogin() ) + if ( ignore.getUserPattern().matcher( author.getLogin() ).matches() && ignore.getTitlePattern().matcher( title ).matches() ) { return false; } diff --git a/src/main/java/org/hibernate/infra/bot/config/RepositoryConfig.java b/src/main/java/org/hibernate/infra/bot/config/RepositoryConfig.java index f2c6995..c68a61a 100644 --- a/src/main/java/org/hibernate/infra/bot/config/RepositoryConfig.java +++ b/src/main/java/org/hibernate/infra/bot/config/RepositoryConfig.java @@ -67,15 +67,15 @@ public void setIgnoreFiles(List ignoreFiles) { public static class IgnoreConfiguration { - private String user; + private Pattern userPattern; private Pattern titlePattern; - public String getUser() { - return user; + public Pattern getUserPattern() { + return userPattern; } - public void setUser(String user) { - this.user = user; + public void setUserPattern(String userPattern) { + this.userPattern = Patterns.compile( userPattern ); } public Pattern getTitlePattern() { diff --git a/src/test/java/org/hibernate/infra/bot/tests/CheckPullRequestContributionRulesJiraTest.java b/src/test/java/org/hibernate/infra/bot/tests/CheckPullRequestContributionRulesJiraTest.java index 1233d1d..29f28df 100644 --- a/src/test/java/org/hibernate/infra/bot/tests/CheckPullRequestContributionRulesJiraTest.java +++ b/src/test/java/org/hibernate/infra/bot/tests/CheckPullRequestContributionRulesJiraTest.java @@ -286,7 +286,7 @@ void ignore_dependabotOpensBuildDependencyUpgradePullRequest() throws IOExceptio jira: projectKey: "HSEARCH" ignore: - - user: dependabot[bot] + - userPattern: dependabot\\[bot\\] titlePattern: ".*\\\\bmaven\\\\b.*\\\\bplugin\\\\b.*" """ );