diff options
| author | Chris Rebert <cvrebert@google.com> | 2016-07-08 10:34:23 +0300 |
|---|---|---|
| committer | Chris Rebert <cvrebert@google.com> | 2016-07-08 10:34:23 +0300 |
| commit | 4b33977f20c1a81f7bfa2367b9e20932cce3f3d3 (patch) | |
| tree | a37acb4934a60cdc8ef16e7556cd63deca3bf95a /src | |
| parent | 9bb32854ba5863d6ef49f0a7d2f332ec46b3b117 (diff) | |
Remove the ignore-branches-from-watched-repo setting
Build PRs of project members in addition to non-members.
If this results in redundant builds you wish to eliminate,
you're advised to refactor members' builds to a more Savage-based workflow.
Diffstat (limited to 'src')
3 files changed, 0 insertions, 3 deletions
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 9af89ec..f2782b3 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -28,7 +28,6 @@ savage { travis-timeout = 2 hours github-repo-to-watch = "twbs/bootstrap" github-test-repo = "twbs-savage/bootstrap" - ignore-branches-from-watched-repo = true allowed-base-branches = [ "master", "v4-dev", "v3-dev" ] trusted-orgs = [ "twbs" ] whitelist = [ diff --git a/src/main/scala/com/getbootstrap/savage/server/PullRequestEventHandler.scala b/src/main/scala/com/getbootstrap/savage/server/PullRequestEventHandler.scala index aa207b9..c09d596 100644 --- a/src/main/scala/com/getbootstrap/savage/server/PullRequestEventHandler.scala +++ b/src/main/scala/com/getbootstrap/savage/server/PullRequestEventHandler.scala @@ -96,7 +96,6 @@ class PullRequestEventHandler( if (settings.AllowedBaseBranches.contains(destBranch)) { prHead.getRepo.repositoryId match { case None => log.error(s"Received event from GitHub about repository with unsafe name") - case Some(settings.MainRepoId) if settings.IgnoreBranchesFromMainRepo => log.info("Ignoring PR whose branch is from the main repo, per settings.") case Some(foreignRepo) => { val baseSha = bsBase.commitSha val headSha = prHead.commitSha diff --git a/src/main/scala/com/getbootstrap/savage/server/Settings.scala b/src/main/scala/com/getbootstrap/savage/server/Settings.scala index a5e2020..5a2041a 100644 --- a/src/main/scala/com/getbootstrap/savage/server/Settings.scala +++ b/src/main/scala/com/getbootstrap/savage/server/Settings.scala @@ -26,7 +26,6 @@ class SettingsImpl(config: Config) extends Extension { val Whitelist: FilePathWhitelist = new FilePathWhitelist(config.getStringList("savage.whitelist").asScala) val Watchlist: FilePathWatchlist = new FilePathWatchlist(config.getStringList("savage.file-watchlist").asScala) val BranchPrefix: String = config.getString("savage.branch-prefix") - val IgnoreBranchesFromMainRepo: Boolean = config.getBoolean("savage.ignore-branches-from-watched-repo") val AllowedBaseBranches: Set[Branch] = config.getStringList("savage.allowed-base-branches").asScala.flatMap{ Branch(_) }.toSet val TrustedOrganizations: Set[String] = config.getStringList("savage.trusted-orgs").asScala.toSet val SetCommitStatus: Boolean = config.getBoolean("savage.set-commit-status") |