Skip to content
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

Implement the DSL for commentFilePath to fix #514 #709

Merged
merged 8 commits into from
Oct 21, 2018
Merged

Implement the DSL for commentFilePath to fix #514 #709

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
42d5d28
Implements the DSL for commentFilePath to fix #514
Mar 1, 2018
f0631b0
Fixed spacing
Apr 9, 2018
f1ff166
remove extra msg comments for build comment file
Apr 27, 2018
f694d84
Avoid posting a comment for empty comment files
Ippo343 Apr 6, 2018
be8ba4b
Merge branch 'master' into keymux-master
bjoernhaeuser May 10, 2018
576fa78
move commentFilePath to an extension point
bjoernhaeuser May 10, 2018
a5b009e
Merge branch 'master' into keymux-master
Sep 13, 2018
94f7a5d
Fix README containing outdated instructions
Sep 14, 2018
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ job('upstreamJob') {
permitAll()
autoCloseFailedPullRequests()
displayBuildErrorsOnDownstreamBuilds()
commentFilePath("relative/path/to/file")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, isn't this changed now according to this: #637 (comment)

@bjoernhaeuser ?

whiteListTargetBranches(['master','test', 'test2'])
blackListTargetBranches(['master','test', 'test2'])
whiteListLabels(['foo', 'bar'])
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbCommentFilePathContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package org.jenkinsci.plugins.ghprb.jobdsl;

import javaposse.jobdsl.dsl.Context;

class GhprbCommentFilePathContext implements Context {
private String commentFilePath;

public String getCommentFilePath() {
return commentFilePath;
}

/**
* sets the path to the comment file
*/
public void commentFilePath(String commentFilePath) {
this.commentFilePath = commentFilePath;
}
}
11 changes: 11 additions & 0 deletions src/main/java/org/jenkinsci/plugins/ghprb/jobdsl/GhprbExtensionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.jenkinsci.plugins.ghprb.extensions.GhprbExtension;
import org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate;
import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildStatus;
import org.jenkinsci.plugins.ghprb.extensions.comments.GhprbCommentFile;
import org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus;

import java.util.ArrayList;
Expand Down Expand Up @@ -41,6 +42,16 @@ void buildStatus(Runnable closure) {
extensions.add(new GhprbBuildStatus(context.getCompletedStatus()));
}

/**
* Adds comment file path handling
*/
void commentFilePath(Runnable closure) {
GhprbCommentFilePathContext context = new GhprbCommentFilePathContext();
ContextExtensionPoint.executeInContext(closure, context);

extensions.add(new GhprbCommentFile(context.getCommentFilePath()));
}

/**
* Overrides global settings for cancelling builds when a PR was updated
*/
Expand Down