Skip to content

Pull/245 #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KostyaSha wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pull/245 #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8186b29
for what it's worth ...
DigitalTargit Jun 19, 2017
abd3d89
Update GitHubBranchTrigger.java
DigitalTargit Nov 29, 2017
c079a2d
restore some files
KostyaSha Nov 30, 2017
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
6 changes: 6 additions & 0 deletions .../src/main/java/com/github/kostyasha/github/integration/branch/GitHubBranchRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ public String getUrlName() {
}


public synchronized void removeBranch(String branchName) {
if (nonNull(branches)) {
branches.remove(branchName);
}
}

/**
* Searches for all builds performed in the runs of current job.
*
Expand Down
65 changes: 60 additions & 5 deletions ...gin/src/main/java/com/github/kostyasha/github/integration/branch/GitHubBranchTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import antlr.ANTLRException;
import com.github.kostyasha.github.integration.branch.events.GitHubBranchEvent;
import com.github.kostyasha.github.integration.branch.events.GitHubBranchEventDescriptor;
import com.github.kostyasha.github.integration.branch.events.impl.GitHubBranchDeletedEvent;
import com.github.kostyasha.github.integration.branch.trigger.JobRunnerForBranchCause;
import com.github.kostyasha.github.integration.generic.GitHubTrigger;
import com.github.kostyasha.github.integration.generic.GitHubTriggerDescriptor;
Expand Down Expand Up @@ -164,9 +165,13 @@ public void queueRun(Job<?, ?> job, final String branch) {
/**
* Runs check
*
* synchronizing a method is bad ... we really should just focus on synchronizing the variable localreposittory
* so that it is cleaned up in case multiple events come in ... so we dont' prematurely fire delete events on
* local repo that maybe processing a delete ...
*
* @param branch - branch for check, if null - then all PRs
*/
public void doRun(String branch) {
public synchronized void doRun(String branch) {
if (not(isBuildable()).apply(job)) {
LOG.debug("Job {} is disabled, but trigger run!", isNull(job) ? "<no job>" : job.getFullName());
return;
Expand Down Expand Up @@ -227,7 +232,7 @@ private List<GitHubBranchCause> readyToBuildCauses(GitHubBranchRepository localR
GHRepository remoteRepo = getRemoteRepository();
Set<GHBranch> remoteBranches = branchesToCheck(requestedBranch, remoteRepo, localRepository);

List<GitHubBranchCause> causes = checkBranches(remoteBranches, localRepository, listener);
List<GitHubBranchCause> causes = checkBranches(branch, remoteBranches, remoteRepo, localRepository, listener);

/*
* update details about the local repo after the causes are determined as they expect
Expand Down Expand Up @@ -256,7 +261,7 @@ private Set<GHBranch> branchesToCheck(@CheckForNull String branch, @Nonnull GHRe
throws IOException {
final LinkedHashSet<GHBranch> ghBranches = new LinkedHashSet<>();

if (branch != null) {
if (branch != null) { // What about DELETED event ? the remote branch is already gone ...
final GHBranch ghBranch = remoteRepo.getBranches().get(branch);
if (ghBranch != null) {
ghBranches.add(ghBranch);
Expand All @@ -268,8 +273,10 @@ private Set<GHBranch> branchesToCheck(@CheckForNull String branch, @Nonnull GHRe
return ghBranches;
}

private List<GitHubBranchCause> checkBranches(Set<GHBranch> remoteBranches,
GitHubBranchRepository localRepository, LoggingTaskListenerWrapper listener) {
private List<GitHubBranchCause> checkBranches(String branchName, Set<GHBranch> remoteBranches, @Nonnull GHRepository remoteRepo,
GitHubBranchRepository localRepository, LoggingTaskListenerWrapper listener)
throws IOException {

List<GitHubBranchCause> causes = remoteBranches.stream()
// TODO: update user whitelist filter
.filter(ifSkippedFirstRun(listener, skipFirstRun))
Expand All @@ -278,6 +285,54 @@ private List<GitHubBranchCause> checkBranches(Set<GHBranch> remoteBranches,
.filter(Objects::nonNull)
.collect(Collectors.toList());

// DELETE BRANCH is a special case since the remote branch exists for all the other events
// and there is probably a more elegant solution ...
//boolean processDelete = false;
for (GitHubBranchEvent event : events) {
//processDelete = (event instanceof GitHubBranchDeletedEvent) ? true : false;
//}
//if (processDelete) {
if (event instanceof GitHubBranchDeletedEvent) {
Map<String, GitHubBranch> localBranches = localRepository.getBranches();
GitHubBranch localBranch = localBranches.get(branchName);
if (localBranch != null) {
Map<String, GHBranch> remoteRepoBranches = remoteRepo.getBranches();
if (remoteRepoBranches.get(branchName) == null) {
causes.add(new GitHubBranchCause(localBranch, localRepository, "Branch Deleted", false));
// we probably want to take the localBranch out of the localRepository ...
// cause that also operates on a empty "Set<GHBranch>" stream ...
localRepository.removeBranch(branchName); // so that we don't process a delete on this again ...
LOG.error("Adding cause to trigger delete event for [{}] : {}", localRepository.getFullName(), branchName);
}
}
break; // we only care about delete in the loop ...
}
}
/*
// DELETE BRANCH is a special case since the remote branch exists for all the other events
// and there is probably a more elegant solution ...
boolean processDelete = false;
for (GitHubBranchEvent event : events) {
if (event instanceof GitHubBranchDeletedEvent) {
processDelete = true;
}
}

if (processDelete) {
synchronized (localRepository) {
Map<String, GitHubBranch> localBranches = localRepository.getBranches();
Map<String, GHBranch> remoteRepoBranches = remoteRepo.getBranches();
localBranches.forEach((localBranchName, localBranch) -> {
if (remoteRepoBranches.get(localBranchName) == null) {
causes.add(new GitHubBranchCause(localBranch, localRepository, "Branch Deleted", false));
LOG.error("MG Adding cause to trigger delete event for [{}] : {}", localRepository.getFullName(), localBranchName);
localRepository.removeBranch(localBranchName);
}
});
}
}
*/

LOG.debug("Build trigger count for [{}] : {}", localRepository.getFullName(), causes.size());
return causes;
}
Expand Down