diff options
6 files changed, 30 insertions, 47 deletions
diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml index 6ec50c21..76f16b94 100644 --- a/.github/workflows/gradle-test.pr.yml +++ b/.github/workflows/gradle-test.pr.yml @@ -3,15 +3,26 @@ name: CI on: pull_request jobs: - test: + test-ubuntu: strategy: matrix: - os: [ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} + version: [ 8, 11, 15 ] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: gradle/wrapper-validation-action@v1 - uses: actions/setup-java@v1 with: - java-version: 11 + java-version: ${{ matrix.version }} - run: ./gradlew clean test --stacktrace + + test-windows: + strategy: + matrix: + version: [ 8, 11, 15 ] + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.version }} + - run: ./gradlew clean test --stacktrace --no-daemon --parallel --max-workers=1 diff --git a/.github/workflows/s3-snapshots.yml b/.github/workflows/s3-snapshots.yml index f9d21817..847e9d7e 100644 --- a/.github/workflows/s3-snapshots.yml +++ b/.github/workflows/s3-snapshots.yml @@ -7,40 +7,6 @@ env: bucket-name: 'dokka-snapshots' jobs: - coroutines: - runs-on: ubuntu-latest - steps: - - name: Checkout dokka - uses: actions/checkout@v2 - with: - submodules: true - - - uses: actions/setup-java@v1 - with: - java-version: 12 - - - name: Publish dokka locally - run: ./gradlew publishToMavenLocal --stacktrace - - - name: Document coroutines - run: ./gradlew :integration-tests:gradle:integrationTest --tests org.jetbrains.dokka.it.gradle.kotlin.CoroutinesGradleIntegrationTest --stacktrace - timeout-minutes: 60 - env: - DOKKA_IT_AWS_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 http://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/coroutines/${GITHUB_SHA::7}/index.html - stdlib: runs-on: ubuntu-latest steps: diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt index d51f27e6..2460c291 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt @@ -11,8 +11,11 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac @get:JvmStatic @get:Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", *ifExhaustive("6.4.1", "6.3", "6.2.2", "6.1.1", "6.0"), "5.6.4"), - kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72"), "1.4.0") + gradleVersions = listOf("7.0", *ifExhaustive("6.6", "6.4.1", "6.3", "6.2.2", "6.1.1")), + kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0-RC") + ) + BuildVersions.permutations( + gradleVersions = listOf("5.6.4", "6.0"), + kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32")) ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt index 9746c8b8..a3b58e35 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt @@ -15,8 +15,11 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", "5.6.4"), - kotlinVersions = listOf("1.4.0") + gradleVersions = listOf("7.0", "6.6"), + kotlinVersions = listOf("1.3.72", "1.4.0", "1.5.0-RC") + ) + BuildVersions.permutations( + gradleVersions = listOf("5.6.4"), + kotlinVersions = listOf("1.4.0", "1.4.32") ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt index c3971eae..db9239e9 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt @@ -10,8 +10,8 @@ class Collector0IntegrationTest(override val versions: BuildVersions) : Abstract @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", "6.1.1"), - kotlinVersions = listOf("1.4.0") + gradleVersions = listOf("7.0", "6.6", "6.1.1"), + kotlinVersions = listOf("1.5.0-RC", "1.4.0") ) } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt index c3ea8e52..cde82246 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt @@ -10,8 +10,8 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra @get:JvmStatic @get:Parameterized.Parameters(name = "{0}") val versions = BuildVersions.permutations( - gradleVersions = listOf("6.6", "6.1.1"), - kotlinVersions = listOf("1.4.0") + gradleVersions = listOf("7.0", "6.6", "6.1.1"), + kotlinVersions = listOf("1.5.0-RC", "1.4.0") ) } |