From 7aae28c09fc52f67d18babb0238dc8a4d397c2ad Mon Sep 17 00:00:00 2001 From: Stefan M Date: Thu, 1 Sep 2022 16:27:11 +0200 Subject: Use GitHub Actions Artifacts to store snapshots instead of S3 (#2630) * Use GitHub Actions Artifacts for snapshots * Delete s3-cleanup.yml * Fix trigger event * Fix path * Fix path again * Maybe this path is better * Restore env variable to save output to a known place * Add retention days * Replace stdlib with coroutines * Replace S3Project with TestOutputCopier * Restore S3 upload * Change job name * Fix imports * Add TestOutputCopier to SdtlibIntegrationTest * Save stdlib on S3 again * Rename env variable * Increase rentention-days * Remove .kt as filter for test * Fix skiping copying message * Update Gradle and Kotlin version --- .../it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt | 8 ++++---- .../gradle/kotlin/SerializationGradleIntegrationTest.kt | 4 ++-- .../it/gradle/kotlin/StdlibGradleIntegrationTest.kt | 4 ++-- .../jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt | 2 +- .../src/main/kotlin/org/jetbrains/dokka/it/S3Project.kt | 16 ---------------- .../kotlin/org/jetbrains/dokka/it/TestOutputCopier.kt | 16 ++++++++++++++++ 6 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 integration-tests/src/main/kotlin/org/jetbrains/dokka/it/S3Project.kt create mode 100644 integration-tests/src/main/kotlin/org/jetbrains/dokka/it/TestOutputCopier.kt (limited to 'integration-tests') diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt index 5a300767..099046b0 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt @@ -1,7 +1,7 @@ package org.jetbrains.dokka.it.gradle.kotlin import org.gradle.testkit.runner.TaskOutcome -import org.jetbrains.dokka.it.S3Project +import org.jetbrains.dokka.it.TestOutputCopier import org.jetbrains.dokka.it.copyAndApplyGitDiff import org.jetbrains.dokka.it.gradle.* import org.junit.runners.Parameterized @@ -9,14 +9,14 @@ import java.io.File import kotlin.test.* class CoroutinesGradleIntegrationTest(override val versions: BuildVersions) : AbstractGradleIntegrationTest(), - S3Project { + TestOutputCopier { companion object { @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.8.3"), - kotlinVersions = listOf("1.6.0") + gradleVersions = listOf("6.9.1"), + kotlinVersions = listOf("1.6.10") ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt index 465231f1..c05e80e6 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt @@ -1,7 +1,7 @@ package org.jetbrains.dokka.it.gradle.kotlin import org.gradle.testkit.runner.TaskOutcome -import org.jetbrains.dokka.it.S3Project +import org.jetbrains.dokka.it.TestOutputCopier import org.jetbrains.dokka.it.copyAndApplyGitDiff import org.jetbrains.dokka.it.gradle.* import org.junit.runners.Parameterized @@ -9,7 +9,7 @@ import java.io.File import kotlin.test.* class SerializationGradleIntegrationTest(override val versions: BuildVersions) : AbstractGradleIntegrationTest(), - S3Project { + TestOutputCopier { companion object { @get:JvmStatic diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt index ba51a1ce..84178fe8 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt @@ -1,7 +1,7 @@ package org.jetbrains.dokka.it.gradle.kotlin import org.gradle.testkit.runner.TaskOutcome -import org.jetbrains.dokka.it.S3Project +import org.jetbrains.dokka.it.TestOutputCopier import org.jetbrains.dokka.it.copyAndApplyGitDiff import org.jetbrains.dokka.it.gradle.AbstractGradleIntegrationTest import org.jetbrains.dokka.it.gradle.BuildVersions @@ -10,7 +10,7 @@ import java.io.File import kotlin.test.* class StdlibGradleIntegrationTest(override val versions: BuildVersions) : AbstractGradleIntegrationTest(), - S3Project { + TestOutputCopier { companion object { @get:JvmStatic diff --git a/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt b/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt index 4037cc08..bf5148ef 100644 --- a/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt +++ b/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt @@ -7,7 +7,7 @@ import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue -class BiojavaIntegrationTest : AbstractIntegrationTest(), S3Project { +class BiojavaIntegrationTest : AbstractIntegrationTest(), TestOutputCopier { private val currentDokkaVersion: String = checkNotNull(System.getenv("DOKKA_VERSION")) private val mavenBinaryFile: File = File(checkNotNull(System.getenv("MVN_BINARY_PATH"))) diff --git a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/S3Project.kt b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/S3Project.kt deleted file mode 100644 index ee69ef62..00000000 --- a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/S3Project.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.dokka.it - -import org.junit.After -import java.io.File - -interface S3Project { - val projectOutputLocation: File - - @After - fun copyToLocation() { - System.getenv("DOKKA_IT_AWS_PATH")?.also { location -> - println("Copying to ${File(location).absolutePath}") - projectOutputLocation.copyRecursively(File(location)) - } ?: println("No copy path provided, skipping") - } -} diff --git a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/TestOutputCopier.kt b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/TestOutputCopier.kt new file mode 100644 index 00000000..30770838 --- /dev/null +++ b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/TestOutputCopier.kt @@ -0,0 +1,16 @@ +package org.jetbrains.dokka.it + +import org.junit.After +import java.io.File + +interface TestOutputCopier { + val projectOutputLocation: File + + @After + fun copyToLocation() { + System.getenv("DOKKA_TEST_OUTPUT_PATH")?.also { location -> + println("Copying to ${File(location).absolutePath}") + projectOutputLocation.copyRecursively(File(location)) + } ?: println("No path via env. varbiable 'DOKKA_TEST_OUTPUT_PATH' provided, skipping copying") + } +} -- cgit