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

[JENKINS-26100] Change buildEnvVars to take Run #102

Merged
merged 5 commits into from
May 19, 2017
Merged

[JENKINS-26100] Change buildEnvVars to take Run #102

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3592fa4
[JENKINS-26100] Change buildEnvVars to take Run
abayer May 1, 2017
d205135
Update to use buildEnvironment
abayer May 2, 2017
7ba9d55
Switch to Jenkins 2.60
abayer May 16, 2017
99845be
Reverting to 1.642.3 baseline
abayer May 18, 2017
67a6581
Add TODOs
abayer May 19, 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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.19</version>
<version>2.27</version>
<relativePath />
</parent>
<artifactId>mercurial</artifactId>
Expand All @@ -16,7 +16,7 @@
<properties>
<jenkins.version>1.642.3</jenkins.version>
<no-test-jar>false</no-test-jar>
<scm-api-plugin.version>2.0.8</scm-api-plugin.version>
<scm-api-plugin.version>2.1.0</scm-api-plugin.version>
Copy link
Member

Choose a reason for hiding this comment

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

java.level → 8

Copy link
Member

Choose a reason for hiding this comment

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

I doubt it is required, but it won't hurt

</properties>

<developers>
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/hudson/plugins/mercurial/MercurialSCM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,11 @@ private void clone(Run<?, ?> build, Launcher launcher, FilePath repository, Node
}

@Override
public void buildEnvVars(AbstractBuild<?,?> build, Map<String, String> env) {
public void buildEnvVars(AbstractBuild<?,?> build, Map<String,String> env) {
buildEnvironment(build, env);
}

public void buildEnvironment(Run<?,?> build, Map<String, String> env) {
Copy link
Member

Choose a reason for hiding this comment

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

Same as for SVN plugin. It is better to reference the incoming method in the Core API.

Copy link
Member Author

Choose a reason for hiding this comment

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

Isn't that literally what I just did here?

Copy link
Member

Choose a reason for hiding this comment

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

Not sure WDYM. I was talking about Javadoc and TODO comment

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, yeah, doing so.

buildEnvVarsFromActionable(build, env);
}

Expand Down