Skip to content

Commit 1dffb22

Browse files
committed
Half attempt to convert to gradle
1 parent cb41d95 commit 1dffb22

File tree

2 files changed

+36
-10
lines changed

2 files changed

+36
-10
lines changed

.teamcity/builds/Build.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@ class Build(
2424
parallel {
2525
listOf("17", "21").forEach { java ->
2626
dependentBuildType(
27-
Maven(
27+
Gradle(
2828
"${name}-build-${java}",
2929
"build - java ${java}",
30-
"sortpom:verify license:check spotless:check compile",
31-
"-DspotlessFiles=src/main/java/.*.java",
32-
java))
30+
"spotlessCheck build",
31+
// "-DspotlessFiles=src/main/java/.*.java",
32+
javaVersion = java)
33+
)
3334
}
3435
}
3536
dependentBuildType(
36-
Maven(
37+
Gradle(
3738
"${name}-test",
3839
"test",
3940
"verify",

.teamcity/builds/Common.kt

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ import jetbrains.buildServer.configs.kotlin.*
44
import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests
55
import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
66
import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests
7+
import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep
78
import jetbrains.buildServer.configs.kotlin.buildSteps.MavenBuildStep
89
import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
10+
import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
911
import jetbrains.buildServer.configs.kotlin.buildSteps.maven
1012
import jetbrains.buildServer.configs.kotlin.buildSteps.script
1113

1214
const val GITHUB_OWNER = "neo4j"
1315
const val GITHUB_REPOSITORY = "import-spec"
1416
const val MAVEN_DEFAULT_ARGS = "--no-transfer-progress --batch-mode --show-version"
17+
const val GRADLE_DEFAULT_ARGS = "--quiet"
1518

1619
const val DEFAULT_JAVA_VERSION = "17"
1720
const val LTS_JAVA_VERSION = "21"
@@ -78,14 +81,36 @@ fun BuildSteps.runMaven(
7881
return maven
7982
}
8083

81-
fun BuildSteps.setVersion(name: String, version: String): MavenBuildStep {
82-
return this.runMaven {
83-
this.name = name
84-
goals = "versions:set"
85-
runnerArgs = "$MAVEN_DEFAULT_ARGS -DnewVersion=$version -DgenerateBackupPoms=false"
84+
fun BuildSteps.runGradle(
85+
javaVersion: String = DEFAULT_JAVA_VERSION,
86+
init: GradleBuildStep.() -> Unit
87+
): GradleBuildStep {
88+
val maven =
89+
this.gradle {
90+
dockerImagePlatform = GradleBuildStep.ImagePlatform.Linux
91+
dockerImage = "eclipse-temurin:${javaVersion}-jdk"
92+
dockerRunParameters = "--volume /var/run/docker.sock:/var/run/docker.sock"
93+
}
94+
95+
init(maven)
96+
return maven
97+
}
98+
99+
fun BuildSteps.setVersion(name: String, version: String): GradleBuildStep {
100+
return this.runGradle {
101+
this.name = name
102+
gradleParams = "$GRADLE_DEFAULT_ARGS -Pversion=$version"
86103
}
87104
}
88105

106+
//fun BuildSteps.setVersion(name: String, version: String): MavenBuildStep {
107+
// return this.runMaven {
108+
// this.name = name
109+
// goals = "versions:set"
110+
// runnerArgs = "$MAVEN_DEFAULT_ARGS -DnewVersion=$version -DgenerateBackupPoms=false"
111+
// }
112+
//}
113+
89114
fun BuildSteps.commitAndPush(
90115
name: String,
91116
commitMessage: String,

0 commit comments

Comments
 (0)