Skip to content

Commit 544cf8a

Browse files
committed
Fix flaky test
1 parent 6c3e332 commit 544cf8a

2 files changed

Lines changed: 10 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: Build
22

33
on:
4-
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
4+
push: {}
85

96
permissions:
107
contents: read
@@ -32,5 +29,5 @@ jobs:
3229
if: always()
3330
uses: actions/upload-artifact@v3
3431
with:
35-
name: build-reports
32+
name: build-reports-${{ matrix.java }}
3633
path: build/reports/

src/test/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionPluginTest.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.gradle.testkit.runner.TaskOutcome
88
import org.gradle.testkit.runner.TaskOutcome.FAILED
99
import org.gradle.testkit.runner.UnexpectedBuildFailure
1010
import org.junit.jupiter.api.Assertions.assertEquals
11-
import org.junit.jupiter.api.Assertions.assertFalse
1211
import org.junit.jupiter.api.Assertions.assertTrue
1312
import org.junit.jupiter.api.Assertions.fail
1413
import org.junit.jupiter.api.Test
@@ -74,8 +73,8 @@ class SemanticVersionPluginTest {
7473
var pomFile = testProjectDir.walk().filter { it.name.startsWith("pom") }.first()
7574
var pom = PomParser.parse(pomFile.absolutePath)
7675
assertEquals("0.1.0", pom.version)
77-
var jarFile = mavenRepo.walk().filter { it.name.endsWith("jar") }.first()
78-
assertTrue(jarFile.absolutePath.endsWith("/dev/poolside/test/my-library/0.1.0/my-library-0.1.0.jar"))
76+
var jarFile = mavenRepo.walk().filter { it.name.endsWith("my-library-0.1.0.jar") }.first()
77+
assertTrue(jarFile.absolutePath.endsWith("/dev/poolside/test/my-library/0.1.0/my-library-0.1.0.jar"), jarFile.absolutePath)
7978
var publishedPom = mavenRepo.walk().filter { it.name.equals("my-library-0.1.0.pom") }.first()
8079
pom = PomParser.parse(publishedPom.absolutePath)
8180
assertEquals("0.1.0", pom.version)
@@ -91,8 +90,8 @@ class SemanticVersionPluginTest {
9190
pomFile = testProjectDir.walk().filter { it.name.startsWith("pom") }.last()
9291
pom = PomParser.parse(pomFile.absolutePath)
9392
assertEquals("0.1.1", pom.version)
94-
jarFile = mavenRepo.walk().filter { it.name.endsWith("jar") }.last()
95-
assertTrue(jarFile.absolutePath.endsWith("/dev/poolside/test/my-library/0.1.1/my-library-0.1.1.jar"))
93+
jarFile = mavenRepo.walk().filter { it.name.endsWith("my-library-0.1.1.jar") }.last()
94+
assertTrue(jarFile.absolutePath.endsWith("/dev/poolside/test/my-library/0.1.1/my-library-0.1.1.jar"), jarFile.absolutePath)
9695
publishedPom = mavenRepo.walk().filter { it.name.equals("my-library-0.1.1.pom") }.last()
9796
pom = PomParser.parse(publishedPom.absolutePath)
9897
assertEquals("0.1.1", pom.version)
@@ -405,8 +404,8 @@ class SemanticVersionPluginTest {
405404
var pomFile = testProjectDir.walk().filter { it.name.startsWith("pom") }.first()
406405
var pom = PomParser.parse(pomFile.absolutePath)
407406
assertEquals("0.1.0", pom.version)
408-
var jarFile = mavenRepo.walk().filter { it.name.endsWith("jar") }.first()
409-
assertTrue(jarFile.absolutePath.endsWith("/dev/poolside/test/my-library/0.1.0/my-library-0.1.0.jar"))
407+
val jarFile = mavenRepo.walk().filter { it.name.endsWith("my-library-0.1.0.jar") }.first()
408+
assertTrue(jarFile.absolutePath.endsWith("/dev/poolside/test/my-library/0.1.0/my-library-0.1.0.jar"), jarFile.absolutePath)
410409
val publishedPom = mavenRepo.walk().filter { it.name.equals("my-library-0.1.0.pom") }.first()
411410
pom = PomParser.parse(publishedPom.absolutePath)
412411
assertEquals("0.1.0", pom.version)
@@ -423,7 +422,7 @@ class SemanticVersionPluginTest {
423422
pomFile = testProjectDir.walk().filter { it.name.startsWith("pom") }.last()
424423
pom = PomParser.parse(pomFile.absolutePath)
425424
assertEquals("0.1.0", pom.version)
426-
jarFile = mavenRepo.walk().filter { it.name.endsWith("jar") }.last()
427-
assertFalse(jarFile.absolutePath.endsWith("/dev/poolside/test/my-library/0.1.1/my-library-0.1.1.jar"))
425+
val jarFiles = mavenRepo.walk().filter { it.name.endsWith("my-library-0.1.1.jar") }.toList()
426+
assertTrue(jarFiles.isEmpty())
428427
}
429428
}

0 commit comments

Comments
 (0)