aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/gh-actions-artifacts-snapshots.yml83
-rw-r--r--.github/workflows/s3-snapshots.yml35
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt8
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt4
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt4
-rw-r--r--integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt2
-rw-r--r--integration-tests/src/main/kotlin/org/jetbrains/dokka/it/TestOutputCopier.kt (renamed from integration-tests/src/main/kotlin/org/jetbrains/dokka/it/S3Project.kt)6
7 files changed, 127 insertions, 15 deletions
diff --git a/.github/workflows/gh-actions-artifacts-snapshots.yml b/.github/workflows/gh-actions-artifacts-snapshots.yml
new file mode 100644
index 00000000..3bac4340
--- /dev/null
+++ b/.github/workflows/gh-actions-artifacts-snapshots.yml
@@ -0,0 +1,83 @@
+name: Build example projects and publish them to GitHub Actions Artifacts
+
+on:
+ pull_request:
+ push:
+ branches:
+ - master
+
+jobs:
+ coroutines:
+ runs-on: ubuntu-latest
+ if: github.repository == 'Kotlin/dokka'
+ steps:
+ - name: Checkout dokka
+ uses: actions/checkout@v3
+ with:
+ submodules: true
+ - uses: actions/setup-java@v3
+ with:
+ distribution: 'zulu'
+ java-version: 12
+ - name: Document coroutines
+ uses: gradle/gradle-build-action@v2
+ with:
+ arguments: :integration-tests:gradle:integrationTest --tests org.jetbrains.dokka.it.gradle.kotlin.CoroutinesGradleIntegrationTest --stacktrace
+ env:
+ DOKKA_TEST_OUTPUT_PATH: /home/runner/work/dokka/coroutines
+ - name: Copy files to GitHub Actions Artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ name: dokka-coroutines
+ path: /home/runner/work/dokka/coroutines
+ retention-days: 7
+
+ serialization:
+ runs-on: ubuntu-latest
+ if: github.repository == 'Kotlin/dokka'
+ steps:
+ - name: Checkout dokka
+ uses: actions/checkout@v3
+ with:
+ submodules: true
+ - uses: actions/setup-java@v3
+ with:
+ distribution: 'zulu'
+ java-version: 12
+ - name: Document serialization
+ uses: gradle/gradle-build-action@v2
+ with:
+ arguments: :integration-tests:gradle:integrationTest --tests org.jetbrains.dokka.it.gradle.kotlin.SerializationGradleIntegrationTest --stacktrace
+ env:
+ DOKKA_TEST_OUTPUT_PATH: /home/runner/work/dokka/serialization
+ - name: Copy files to GitHub Actions Artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ name: dokka-serialization
+ path: /home/runner/work/dokka/serialization
+ retention-days: 7
+
+ biojava:
+ runs-on: ubuntu-latest
+ if: github.repository == 'Kotlin/dokka'
+ steps:
+ - name: Checkout dokka
+ uses: actions/checkout@v3
+ with:
+ submodules: true
+ - uses: actions/setup-java@v3
+ with:
+ distribution: 'zulu'
+ java-version: 12
+ - name: Document biojava-core
+ uses: gradle/gradle-build-action@v2
+ with:
+ arguments: :integration-tests:maven:integrationTest --tests org.jetbrains.dokka.it.maven.BiojavaIntegrationTest --stacktrace
+ env:
+ DOKKA_TEST_OUTPUT_PATH: /home/runner/work/dokka/biojava
+ - name: Copy files to GitHub Actions Artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ name: dokka-biojava
+ path: /home/runner/work/dokka/biojava
+ retention-days: 7
diff --git a/.github/workflows/s3-snapshots.yml b/.github/workflows/s3-snapshots.yml
index 2e84050f..fdfb3460 100644
--- a/.github/workflows/s3-snapshots.yml
+++ b/.github/workflows/s3-snapshots.yml
@@ -24,7 +24,7 @@ jobs:
with:
arguments: :integration-tests:gradle:integrationTest --tests org.jetbrains.dokka.it.gradle.kotlin.StdlibGradleIntegrationTest --stacktrace
env:
- DOKKA_IT_AWS_PATH: /home/runner/work/dokka/stdlib
+ DOKKA_TEST_OUTPUT_PATH: /home/runner/work/dokka/stdlib
- name: Configure AWS credentials for S3 access
uses: aws-actions/configure-aws-credentials@v1
with:
@@ -36,6 +36,35 @@ jobs:
- name: Print link
run: echo https://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/stdlib/${GITHUB_SHA::7}/index.html
+ coroutines:
+ runs-on: ubuntu-latest
+ if: github.repository == 'Kotlin/dokka'
+ steps:
+ - name: Checkout dokka
+ uses: actions/checkout@v3
+ with:
+ submodules: true
+ - uses: actions/setup-java@v3
+ with:
+ distribution: 'zulu'
+ java-version: 12
+ - name: Document coroutines
+ uses: gradle/gradle-build-action@v2
+ with:
+ arguments: :integration-tests:gradle:integrationTest --tests org.jetbrains.dokka.it.gradle.kotlin.CoroutinesGradleIntegrationTest --stacktrace
+ env:
+ DOKKA_TEST_OUTPUT_PATH: /home/runner/work/dokka/coroutines
+ - name: Configure AWS credentials for S3 access
+ uses: aws-actions/configure-aws-credentials@v1
+ with:
+ aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+ aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+ aws-region: eu-central-1
+ - name: Copy files to dokka's S3 bucket
+ run: ./integration-tests/aws_sync.sh s3://${{ env.bucket-name }} coroutines ../coroutines
+ - name: Print link
+ run: echo https://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/coroutines/${GITHUB_SHA::7}/index.html
+
serialization:
runs-on: ubuntu-latest
if: github.repository == 'Kotlin/dokka'
@@ -53,7 +82,7 @@ jobs:
with:
arguments: :integration-tests:gradle:integrationTest --tests org.jetbrains.dokka.it.gradle.kotlin.SerializationGradleIntegrationTest --stacktrace
env:
- DOKKA_IT_AWS_PATH: /home/runner/work/dokka/serialization
+ DOKKA_TEST_OUTPUT_PATH: /home/runner/work/dokka/serialization
- name: Configure AWS credentials for S3 access
uses: aws-actions/configure-aws-credentials@v1
with:
@@ -82,7 +111,7 @@ jobs:
with:
arguments: :integration-tests:maven:integrationTest --tests org.jetbrains.dokka.it.maven.BiojavaIntegrationTest --stacktrace
env:
- DOKKA_IT_AWS_PATH: /home/runner/work/dokka/biojava
+ DOKKA_TEST_OUTPUT_PATH: /home/runner/work/dokka/biojava
- name: Configure AWS credentials for S3 access
uses: aws-actions/configure-aws-credentials@v1
with:
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/TestOutputCopier.kt
index ee69ef62..30770838 100644
--- a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/S3Project.kt
+++ b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/TestOutputCopier.kt
@@ -3,14 +3,14 @@ package org.jetbrains.dokka.it
import org.junit.After
import java.io.File
-interface S3Project {
+interface TestOutputCopier {
val projectOutputLocation: File
@After
fun copyToLocation() {
- System.getenv("DOKKA_IT_AWS_PATH")?.also { location ->
+ System.getenv("DOKKA_TEST_OUTPUT_PATH")?.also { location ->
println("Copying to ${File(location).absolutePath}")
projectOutputLocation.copyRecursively(File(location))
- } ?: println("No copy path provided, skipping")
+ } ?: println("No path via env. varbiable 'DOKKA_TEST_OUTPUT_PATH' provided, skipping copying")
}
}
generated by cgit (git 2.46.0) at 2024-11-27 17:04:27 +0000