Skip to content

Fix JENKINS-75500: Report build status to GitHub merge queue #872

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix JENKINS-75500: Report build status to GitHub merge queue #872

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubBuildStatusNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import java.util.logging.Logger;
import jenkins.model.Jenkins;
import jenkins.plugins.git.AbstractGitSCMSource.SCMRevisionImpl;
import hudson.plugins.git.util.BuildData;
import jenkins.scm.api.SCMHead;
import jenkins.scm.api.SCMHeadObserver;
import jenkins.scm.api.SCMRevision;
Expand Down Expand Up @@ -79,6 +80,20 @@ private static void createBuildCommitStatus(Run<?, ?> build, TaskListener listen
if (repo != null) {
Result result = build.getResult();
String revisionToNotify = resolveHeadCommit(revision);

// Check if we're in a merge queue context by looking at the actual built commit
BuildData buildData = build.getAction(BuildData.class);
if (buildData != null && buildData.getLastBuiltRevision() != null) {
String builtCommit = buildData.getLastBuiltRevision().getSha1String();
// If the built commit differs from what we'd normally report, and we're building a PR,
// this might be a merge queue build
if (builtCommit != null && !builtCommit.equals(revisionToNotify) && revision instanceof PullRequestSCMRevision) {
LOGGER.log(Level.FINE, "Detected possible merge queue build. Using actual built commit {0} instead of PR head {1}",
new Object[]{builtCommit, revisionToNotify});
revisionToNotify = builtCommit;
}
}

SCMHead head = revision.getHead();
List<AbstractGitHubNotificationStrategy> strategies = new GitHubSCMSourceContext(
null, SCMHeadObserver.none())
Expand Down