Revert "Ignore compose experimental modules during artifacts check"
This reverts commit a1250e838b.
KTI-1360
This commit is contained in:
committed by
Space Team
parent
88453a05f1
commit
96a798d400
@@ -22,16 +22,6 @@ class ArtifactsTest {
|
|||||||
private val localRepoPath = Paths.get(mavenLocal, "org/jetbrains/kotlin")
|
private val localRepoPath = Paths.get(mavenLocal, "org/jetbrains/kotlin")
|
||||||
private val expectedRepoPath = Paths.get("repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin")
|
private val expectedRepoPath = Paths.get("repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin")
|
||||||
|
|
||||||
/**
|
|
||||||
* Experimental projects that might be published locally but are not epxected to be published by default.
|
|
||||||
* They still might be added to TeamCity maven.zip final artifacts with an additional code.
|
|
||||||
*/
|
|
||||||
private val experimentalProjects = setOf(
|
|
||||||
"compiler-hosted",
|
|
||||||
"compiler-daemon",
|
|
||||||
"compiler",
|
|
||||||
)
|
|
||||||
|
|
||||||
private val excludedProjects = setOf(
|
private val excludedProjects = setOf(
|
||||||
"annotation-processor-example",
|
"annotation-processor-example",
|
||||||
"android-test-fixes",
|
"android-test-fixes",
|
||||||
@@ -60,16 +50,12 @@ class ArtifactsTest {
|
|||||||
})
|
})
|
||||||
actualPoms.forEach { actual ->
|
actualPoms.forEach { actual ->
|
||||||
val expectedPomPath = actual.toExpectedPath()
|
val expectedPomPath = actual.toExpectedPath()
|
||||||
val parentDirName = expectedPomPath.parent.fileName.toString()
|
if ("${expectedPomPath.parent.fileName}" !in excludedProjects) {
|
||||||
|
val actualString = actual.toFile().readText().replace(kotlinVersion, "ArtifactsTest.version")
|
||||||
if (parentDirName !in experimentalProjects) {
|
assertEqualsToFile(expectedPomPath, actualString)
|
||||||
if (parentDirName !in excludedProjects) {
|
visitedPoms.add(expectedPomPath)
|
||||||
val actualString = actual.toFile().readText().replace(kotlinVersion, "ArtifactsTest.version")
|
} else {
|
||||||
assertEqualsToFile(expectedPomPath, actualString)
|
if (isTeamCityBuild) fail("Excluded project in actual artifacts: $actual")
|
||||||
visitedPoms.add(expectedPomPath)
|
|
||||||
} else {
|
|
||||||
if (isTeamCityBuild) fail("Excluded project in actual artifacts: $actual")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user