Skip to content

Commit 43b644f

Browse files
authored
fix(shared): adjust how major version is inferred (#1671)
Fixes #1670.
1 parent 7fda2e8 commit 43b644f

File tree

2 files changed

+3
-4
lines changed
  • shared-internal/src
    • main/kotlin/io/github/typesafegithub/workflows/shared/internal/model
    • test/kotlin/io/github/typesafegithub/workflows/shared/internal/model

2 files changed

+3
-4
lines changed

shared-internal/src/main/kotlin/io/github/typesafegithub/workflows/shared/internal/model/Version.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ data class Version(
2525

2626
override fun toString(): String = version
2727

28-
fun isMajorVersion(): Boolean = version.contains(".").not()
28+
fun isMajorVersion(): Boolean = version.removePrefix("v").removePrefix("V").toIntOrNull() != null
2929

3030
suspend fun getReleaseDate() = dateProvider()
3131
}

shared-internal/src/test/kotlin/io/github/typesafegithub/workflows/shared/internal/model/VersionTest.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ class VersionTest :
1111
Pair("v1.2", false),
1212
Pair("v3", true),
1313
Pair("V3", true),
14-
// Incorrect behavior, will be fixed in https://github.com/typesafegithub/github-workflows-kt/issues/1670
15-
Pair("v3-prerelease", true),
16-
Pair("beta-v3", true),
14+
Pair("v3-prerelease", false),
15+
Pair("beta-v3", false),
1716
).forEach { (version, isMajor) ->
1817
test("isMajorVersion works correctly for $version") {
1918
Version(version).isMajorVersion() shouldBe isMajor

0 commit comments

Comments
 (0)