Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove NPM validation #3312

Merged
merged 1 commit into from Jun 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 1 addition & 22 deletions integration-testing/build.gradle
Expand Up @@ -14,11 +14,6 @@ repositories {
}

sourceSets {
npmTest {
kotlin
compileClasspath += sourceSets.test.runtimeClasspath
runtimeClasspath += sourceSets.test.runtimeClasspath
}
mavenTest {
kotlin
compileClasspath += sourceSets.test.runtimeClasspath
Expand All @@ -43,20 +38,6 @@ compileDebugAgentTestKotlin {
}
}

task npmTest(type: Test) {
def sourceSet = sourceSets.npmTest
environment "projectRoot", project.rootDir
environment "deployVersion", version
def dryRunNpm = project.properties['dryRun']
def doRun = dryRunNpm == "true" // so that we don't accidentally publish anything, especially before the test
onlyIf { doRun }
if (doRun) { // `onlyIf` only affects execution of the task, not the dependency subtree
dependsOn(project(':').getTasksByName("publishNpm", true))
}
testClassesDirs = sourceSet.output.classesDirs
classpath = sourceSet.runtimeClasspath
}

task mavenTest(type: Test) {
environment "version", version
def sourceSet = sourceSets.mavenTest
Expand Down Expand Up @@ -96,8 +77,6 @@ task coreAgentTest(type: Test) {
dependencies {
testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
testImplementation 'junit:junit:4.12'
npmTestImplementation 'org.apache.commons:commons-compress:1.18'
npmTestImplementation 'com.google.code.gson:gson:2.8.5'
debugAgentTestImplementation project(':kotlinx-coroutines-core')
debugAgentTestImplementation project(':kotlinx-coroutines-debug')
coreAgentTestImplementation project(':kotlinx-coroutines-core')
Expand All @@ -108,5 +87,5 @@ compileTestKotlin {
}

check {
dependsOn([npmTest, mavenTest, debugAgentTest, coreAgentTest])
dependsOn([mavenTest, debugAgentTest, coreAgentTest])
}
71 changes: 0 additions & 71 deletions integration-testing/src/npmTest/kotlin/NpmPublicationValidator.kt

This file was deleted.