Skip to content
Permalink
Browse files

[JENKINS-43507] Should be first round complete for scm-api changes

  • Loading branch information...
stephenc committed May 4, 2017
1 parent 77ea2b2 commit ecada1f1a8116a668908527b612f42e198a70d42
Showing with 7 additions and 5 deletions.
  1. +7 −5 src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
@@ -702,11 +702,12 @@ protected final void retrieve(@CheckForNull SCMSourceCriteria criteria,
BranchSCMHead head = new BranchSCMHead(branchName);
if (request.process(head, new SCMRevisionImpl(head, branch.getSHA1()),
new SCMSourceRequest.ProbeLambda<BranchSCMHead, SCMRevisionImpl>() {
@NonNull
@Override
public SCMSourceCriteria.Probe create(BranchSCMHead head,
SCMRevisionImpl revision)
public SCMSourceCriteria.Probe create(@NonNull BranchSCMHead head,
@Nullable SCMRevisionImpl revisionInfo)
throws IOException, InterruptedException {
return GitHubSCMSource.this.createProbe(head, revision);
return GitHubSCMSource.this.createProbe(head, revisionInfo);
}
}, new CriteriaWitness(listener))) {
listener.getLogger().format("%n %d branches were processed (query completed)%n", count);
@@ -753,9 +754,10 @@ protected final void retrieve(@CheckForNull SCMSourceCriteria criteria,
),
null,
new SCMSourceRequest.ProbeLambda<PullRequestSCMHead, Void>() {
@NonNull
@Override
public SCMSourceCriteria.Probe create(PullRequestSCMHead head,
@Nullable Void ignored)
public SCMSourceCriteria.Probe create(@NonNull PullRequestSCMHead head,
@Nullable Void revisionInfo)
throws IOException, InterruptedException {
return GitHubSCMSource.this
.createProbe(trusted ? head : head.getTarget(), null);

0 comments on commit ecada1f

Please sign in to comment.
You can’t perform that action at this time.