Skip to content

Commit 937e0b3

Browse files
authored
Merge pull request #429 from mamh-java/workaround-remove-MultiSCM
add workaround to remove multiplescms.MultiSCM support in pipeline
2 parents fbed9ac + d62d034 commit 937e0b3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
import java.util.Collection;
4949
import java.util.Collections;
5050
import java.util.List;
51+
import java.util.stream.Collectors;
52+
5153
import jenkins.model.Jenkins;
5254
import jenkins.scm.api.SCMFileSystem;
5355
import jenkins.security.HMACConfidentialKey;
@@ -218,7 +220,8 @@ private String getFilePathSuffix() {
218220
public Collection<? extends SCMDescriptor<?>> getApplicableDescriptors() {
219221
StaplerRequest req = Stapler.getCurrentRequest();
220222
Job<?,?> job = req != null ? req.findAncestorObject(Job.class) : null;
221-
return SCM._for(job);
223+
return SCM._for(job).stream().filter(d -> !"org.jenkinsci.plugins.multiplescms.MultiSCM".equals(d.getId())).collect(Collectors.toList());
224+
222225
}
223226

224227
// TODO doCheckLightweight impossible to write even though we have SCMFileSystem.supports(SCM), because form validation cannot pass the SCM object

0 commit comments

Comments
 (0)