Skip to content

Commit f2376f2

Browse files
committed
chore: fix spotless ratchetFrom calculation
1 parent 491555d commit f2376f2

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

build.gradle.kts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,18 @@ sonar {
8585
}
8686
}
8787

88-
val spotlessRatchetRef = providers.environmentVariable("GITHUB_BASE_REF")
89-
.map { "origin/$it" }
90-
.orElse(
91-
providers.environmentVariable("GITHUB_REF_NAME")
92-
.map { refName ->
93-
if (refName.startsWith("release/")) {
94-
"origin/$refName"
95-
} else {
96-
"origin/main"
97-
}
98-
},
99-
)
100-
.getOrElse("origin/main")
88+
val spotlessRatchetRef = providers.provider {
89+
val baseRef = providers.environmentVariable("GITHUB_BASE_REF").orNull
90+
?.takeIf { it.isNotBlank() }
91+
val refName = providers.environmentVariable("GITHUB_REF_NAME").orNull
92+
?.takeIf { it.isNotBlank() }
93+
94+
when {
95+
baseRef != null -> "origin/$baseRef"
96+
refName != null && refName.startsWith("release/") -> "origin/$refName"
97+
else -> "origin/main"
98+
}
99+
}.get()
101100

102101
spotless {
103102
ratchetFrom = spotlessRatchetRef

0 commit comments

Comments
 (0)