Skip to content

Commit 246663d

Browse files
committed
Don't run greclipse, because of eclipse.org flakiness
1 parent 63b2c56 commit 246663d

1 file changed

Lines changed: 28 additions & 25 deletions

File tree

buildSrc/src/main/groovy/cf-spotless.gradle

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -96,35 +96,38 @@ spotless {
9696

9797
// Only define a groovyGradle task on the root project, for simplicity in setting the target pattern
9898
if (project == project.rootProject) {
99-
groovyGradle {
100-
target("**/*.gradle")
101-
targetExclude(doNotFormat)
102-
greclipse() // which formatter Spotless should use to format .gradle files.
103-
if (project.hasProperty("eisopFormatting")) {
104-
leadingTabsToSpaces(4)
105-
} else {
106-
leadingTabsToSpaces(2)
99+
// eclipse.org flakiness leads to "Failed to provision P2 dependencies".
100+
if (false) {
101+
groovyGradle {
102+
target("**/*.gradle")
103+
targetExclude(doNotFormat)
104+
greclipse() // which formatter Spotless should use to format .gradle files.
105+
if (project.hasProperty("eisopFormatting")) {
106+
leadingTabsToSpaces(4)
107+
} else {
108+
leadingTabsToSpaces(2)
109+
}
110+
trimTrailingWhitespace()
111+
// endWithNewline() // Don't want to end empty files with a newline
107112
}
108-
trimTrailingWhitespace()
109-
// endWithNewline() // Don't want to end empty files with a newline
110-
}
111113

112-
groovy {
113-
target("buildSrc/**/*.groovy")
114-
targetExclude(doNotFormat)
115-
importOrder()
114+
groovy {
115+
target("buildSrc/**/*.groovy")
116+
targetExclude(doNotFormat)
117+
importOrder()
116118

117-
removeSemicolons() // removes semicolons at the end of lines
118-
greclipse()
119-
leadingTabsToSpaces(2)
120-
trimTrailingWhitespace()
121-
}
119+
removeSemicolons() // removes semicolons at the end of lines
120+
greclipse()
121+
leadingTabsToSpaces(2)
122+
trimTrailingWhitespace()
123+
}
122124

123-
// Don't do this, because it does not respect "ignore=true" in .editorconfig nor `doNotFormat` here.
124-
// shell {
125-
// targetExclude doNotFormat
126-
// shfmt() // configuration is in .editorconfig
127-
// }
125+
// Don't do this, because it does not respect "ignore=true" in .editorconfig nor `doNotFormat` here.
126+
// shell {
127+
// targetExclude doNotFormat
128+
// shfmt() // configuration is in .editorconfig
129+
// }
130+
}
128131
}
129132
}
130133

0 commit comments

Comments
 (0)