From 12b33a9a4d58b7a90ec5b0da4cf27685867cff83 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 11:54:46 +0800 Subject: [PATCH 01/14] Bump actions/checkout to v3 --- .github/workflows/apiCheck.yml | 2 +- .github/workflows/dokka-examples.yml | 10 +++++----- .github/workflows/gh-pages-examples.yml | 4 ++-- .github/workflows/gh-pages.yml | 2 +- .github/workflows/gradle-test.pr.yml | 4 ++-- .github/workflows/rebase.yml | 2 +- .github/workflows/s3-snapshots.yml | 6 +++--- .github/workflows/wrapper-validation.yml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/apiCheck.yml b/.github/workflows/apiCheck.yml index 0e9c61d0e5..81cb80f286 100644 --- a/.github/workflows/apiCheck.yml +++ b/.github/workflows/apiCheck.yml @@ -6,7 +6,7 @@ jobs: apiCheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: distribution: 'zulu' diff --git a/.github/workflows/dokka-examples.yml b/.github/workflows/dokka-examples.yml index bd15e404d1..155d9dd821 100644 --- a/.github/workflows/dokka-examples.yml +++ b/.github/workflows/dokka-examples.yml @@ -16,7 +16,7 @@ jobs: ] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: @@ -43,7 +43,7 @@ jobs: ] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: @@ -64,7 +64,7 @@ jobs: tasks: [dokkaJavadocJar, dokkaHtmlJar] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: @@ -89,7 +89,7 @@ jobs: - task: "dokkaHtmlMultiModule" dir: "examples/gradle/dokka-multimodule-example" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: @@ -107,7 +107,7 @@ jobs: run-dokka-maven-example: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: diff --git a/.github/workflows/gh-pages-examples.yml b/.github/workflows/gh-pages-examples.yml index a47d37b219..6feb53a553 100644 --- a/.github/workflows/gh-pages-examples.yml +++ b/.github/workflows/gh-pages-examples.yml @@ -19,7 +19,7 @@ jobs: ] steps: - name: Checkout dokka - uses: actions/checkout@v2 + uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: @@ -54,7 +54,7 @@ jobs: ] steps: - name: Checkout dokka - uses: actions/checkout@v2 + uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index a221dcfa97..53d6c7f909 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout dokka - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: dokka diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml index 657e2494e7..eebf492c08 100644 --- a/.github/workflows/gradle-test.pr.yml +++ b/.github/workflows/gradle-test.pr.yml @@ -9,7 +9,7 @@ jobs: version: [ 8, 11, 17 ] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: distribution: 'zulu' @@ -23,7 +23,7 @@ jobs: fail-fast: false runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: distribution: 'zulu' diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 8cebe2a608..1e85385955 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the latest code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Automatic Rebase diff --git a/.github/workflows/s3-snapshots.yml b/.github/workflows/s3-snapshots.yml index be7c3e8cfb..1e521ca023 100644 --- a/.github/workflows/s3-snapshots.yml +++ b/.github/workflows/s3-snapshots.yml @@ -12,7 +12,7 @@ jobs: if: github.repository == 'Kotlin/dokka' steps: - name: Checkout dokka - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true @@ -44,7 +44,7 @@ jobs: if: github.repository == 'Kotlin/dokka' steps: - name: Checkout dokka - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true @@ -76,7 +76,7 @@ jobs: if: github.repository == 'Kotlin/dokka' steps: - name: Checkout dokka - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true diff --git a/.github/workflows/wrapper-validation.yml b/.github/workflows/wrapper-validation.yml index 7c78fcf1ed..780b3069be 100644 --- a/.github/workflows/wrapper-validation.yml +++ b/.github/workflows/wrapper-validation.yml @@ -6,5 +6,5 @@ jobs: name: "Validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1.0.4 \ No newline at end of file From 090779e4a442f917112c50121cc62b7310131f94 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 11:55:06 +0800 Subject: [PATCH 02/14] Bump actions/setup-java to v3 --- .github/workflows/apiCheck.yml | 2 +- .github/workflows/dokka-examples.yml | 10 +++++----- .github/workflows/gh-pages-examples.yml | 4 ++-- .github/workflows/gh-pages.yml | 2 +- .github/workflows/gradle-test.pr.yml | 4 ++-- .github/workflows/s3-snapshots.yml | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/apiCheck.yml b/.github/workflows/apiCheck.yml index 81cb80f286..e08b46bb58 100644 --- a/.github/workflows/apiCheck.yml +++ b/.github/workflows/apiCheck.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 diff --git a/.github/workflows/dokka-examples.yml b/.github/workflows/dokka-examples.yml index 155d9dd821..8ff61db9b6 100644 --- a/.github/workflows/dokka-examples.yml +++ b/.github/workflows/dokka-examples.yml @@ -23,7 +23,7 @@ jobs: filters: | examples_changed: - '${{ matrix.projects }}/**' - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 @@ -50,7 +50,7 @@ jobs: filters: | examples_changed: - '${{ matrix.projects }}/**' - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 @@ -71,7 +71,7 @@ jobs: filters: | examples_changed: - 'examples/gradle/dokka-library-publishing-example/**' - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 @@ -96,7 +96,7 @@ jobs: filters: | examples_changed: - '${{ matrix.dir }}/**' - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 @@ -115,7 +115,7 @@ jobs: examples_changed: - 'examples/maven/**' working-directory: examples/maven - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 diff --git a/.github/workflows/gh-pages-examples.yml b/.github/workflows/gh-pages-examples.yml index 6feb53a553..0aeb8700ea 100644 --- a/.github/workflows/gh-pages-examples.yml +++ b/.github/workflows/gh-pages-examples.yml @@ -27,7 +27,7 @@ jobs: examples_changed: - 'examples/gradle/${{ matrix.projects }}/**' - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 @@ -62,7 +62,7 @@ jobs: examples_changed: - 'examples/gradle/${{ matrix.projects }}/**' - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 53d6c7f909..abf6c0a282 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -23,7 +23,7 @@ jobs: - 'docs/**' working-directory: ./dokka - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml index eebf492c08..71fa4afc78 100644 --- a/.github/workflows/gradle-test.pr.yml +++ b/.github/workflows/gradle-test.pr.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.version }} @@ -24,7 +24,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.version }} diff --git a/.github/workflows/s3-snapshots.yml b/.github/workflows/s3-snapshots.yml index 1e521ca023..96801a76f9 100644 --- a/.github/workflows/s3-snapshots.yml +++ b/.github/workflows/s3-snapshots.yml @@ -16,7 +16,7 @@ jobs: with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 12 @@ -48,7 +48,7 @@ jobs: with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 12 @@ -80,7 +80,7 @@ jobs: with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 12 From 9e880de3e23fc14ba1918b86fa331bc5a4a3e5a1 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 12:02:13 +0800 Subject: [PATCH 03/14] Use gradle-build-action --- .github/workflows/apiCheck.yml | 4 +++- .github/workflows/dokka-examples.yml | 4 ++++ .github/workflows/gh-pages-examples.yml | 4 ++++ .github/workflows/gh-pages.yml | 2 ++ .github/workflows/gradle-test.pr.yml | 8 ++++++-- .github/workflows/s3-snapshots.yml | 12 +++++++++--- 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.github/workflows/apiCheck.yml b/.github/workflows/apiCheck.yml index e08b46bb58..c31748cbe6 100644 --- a/.github/workflows/apiCheck.yml +++ b/.github/workflows/apiCheck.yml @@ -11,4 +11,6 @@ jobs: with: distribution: 'zulu' java-version: 11 - - run: ./gradlew apiCheck --stacktrace + - uses: gradle/gradle-build-action@v2 + with: + arguments: ./gradlew apiCheck --stacktrace diff --git a/.github/workflows/dokka-examples.yml b/.github/workflows/dokka-examples.yml index 8ff61db9b6..becc02864b 100644 --- a/.github/workflows/dokka-examples.yml +++ b/.github/workflows/dokka-examples.yml @@ -27,6 +27,7 @@ jobs: with: distribution: 'zulu' java-version: 11 + - uses: gradle/gradle-build-action@v2 - run: ./gradlew build --no-daemon --stacktrace working-directory: ${{ matrix.projects }} if: steps.filter.outputs.examples_changed == 'true' @@ -54,6 +55,7 @@ jobs: with: distribution: 'zulu' java-version: 11 + - uses: gradle/gradle-build-action@v2 - run: ./gradlew dokkaHtml --no-daemon --stacktrace working-directory: ${{ matrix.projects }} if: steps.filter.outputs.examples_changed == 'true' @@ -75,6 +77,7 @@ jobs: with: distribution: 'zulu' java-version: 11 + - uses: gradle/gradle-build-action@v2 - run: ./gradlew ${{ matrix.tasks }} --no-daemon --stacktrace working-directory: examples/gradle/dokka-library-publishing-example if: steps.filter.outputs.examples_changed == 'true' @@ -100,6 +103,7 @@ jobs: with: distribution: 'zulu' java-version: 11 + - uses: gradle/gradle-build-action@v2 - run: ./gradlew ${{ matrix.task }} --no-daemon --stacktrace working-directory: ${{ matrix.dir }} if: steps.filter.outputs.examples_changed == 'true' diff --git a/.github/workflows/gh-pages-examples.yml b/.github/workflows/gh-pages-examples.yml index 0aeb8700ea..f84066c0c5 100644 --- a/.github/workflows/gh-pages-examples.yml +++ b/.github/workflows/gh-pages-examples.yml @@ -32,6 +32,8 @@ jobs: distribution: 'zulu' java-version: 11 + - uses: gradle/gradle-build-action@v2 + - name: Build html run: ./gradlew dokkaHtml --no-daemon --stacktrace working-directory: examples/gradle/${{ matrix.projects }} @@ -67,6 +69,8 @@ jobs: distribution: 'zulu' java-version: 11 + - uses: gradle/gradle-build-action@v2 + - name: Build html run: ./gradlew dokkaHtmlMultiModule --no-daemon --stacktrace working-directory: examples/gradle/${{ matrix.projects }} diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index abf6c0a282..49f2d6446c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -28,6 +28,8 @@ jobs: distribution: 'zulu' java-version: 11 + - uses: gradle/gradle-build-action@v2 + - name: Get current dokka version run: echo "DOKKA_VERSION=`./gradlew :properties | grep '^version:.*' | cut -d ' ' -f 2 | cut -d '-' -f 1`" >> $GITHUB_ENV if: steps.filter.outputs.docs_changed == 'true' diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml index 71fa4afc78..46ab765d5d 100644 --- a/.github/workflows/gradle-test.pr.yml +++ b/.github/workflows/gradle-test.pr.yml @@ -14,7 +14,9 @@ jobs: with: distribution: 'zulu' java-version: ${{ matrix.version }} - - run: ./gradlew clean test --stacktrace + - uses: gradle/gradle-build-action@v2 + with: + arguments: clean test --stacktrace test-windows: strategy: @@ -28,4 +30,6 @@ jobs: with: distribution: 'zulu' java-version: ${{ matrix.version }} - - run: ./gradlew clean test --stacktrace --no-daemon --parallel --max-workers=1 + - uses: gradle/gradle-build-action@v2 + with: + arguments: clean test --stacktrace --no-daemon --parallel --max-workers=1 diff --git a/.github/workflows/s3-snapshots.yml b/.github/workflows/s3-snapshots.yml index 96801a76f9..c8426e21df 100644 --- a/.github/workflows/s3-snapshots.yml +++ b/.github/workflows/s3-snapshots.yml @@ -22,7 +22,9 @@ jobs: java-version: 12 - name: Document stdlib - run: ./gradlew :integration-tests:gradle:integrationTest --tests org.jetbrains.dokka.it.gradle.kotlin.StdlibGradleIntegrationTest --stacktrace + uses: gradle/gradle-build-action@v2 + 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 @@ -54,7 +56,9 @@ jobs: java-version: 12 - name: Document serialization - run: ./gradlew :integration-tests:gradle:integrationTest --tests org.jetbrains.dokka.it.gradle.kotlin.SerializationGradleIntegrationTest --stacktrace + uses: gradle/gradle-build-action@v2 + 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 @@ -86,7 +90,9 @@ jobs: java-version: 12 - name: Document biojava-core - run: ./gradlew :integration-tests:maven:integrationTest --tests org.jetbrains.dokka.it.maven.BiojavaIntegrationTest --stacktrace + uses: gradle/gradle-build-action@v2 + with: + arguments: :integration-tests:maven:integrationTest --tests org.jetbrains.dokka.it.maven.BiojavaIntegrationTest --stacktrace env: DOKKA_IT_AWS_PATH: /home/runner/work/dokka/biojava From 5e61172bd4e5f7469191686e0215336e79b239d2 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 12:03:38 +0800 Subject: [PATCH 04/14] Merge validation into check.yml --- .github/workflows/{apiCheck.yml => check.yml} | 6 ++++++ .github/workflows/wrapper-validation.yml | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) rename .github/workflows/{apiCheck.yml => check.yml} (71%) delete mode 100644 .github/workflows/wrapper-validation.yml diff --git a/.github/workflows/apiCheck.yml b/.github/workflows/check.yml similarity index 71% rename from .github/workflows/apiCheck.yml rename to .github/workflows/check.yml index c31748cbe6..14b3ac0a80 100644 --- a/.github/workflows/apiCheck.yml +++ b/.github/workflows/check.yml @@ -3,6 +3,12 @@ name: CI on: pull_request jobs: + validation: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: gradle/wrapper-validation-action@v1 + apiCheck: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/wrapper-validation.yml b/.github/workflows/wrapper-validation.yml deleted file mode 100644 index 780b3069be..0000000000 --- a/.github/workflows/wrapper-validation.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: "Validate Gradle Wrapper" -on: pull_request - -jobs: - validation: - name: "Validation" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1.0.4 \ No newline at end of file From e33f878b22c492958513c6b85b075059ffd837f4 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 12:04:08 +0800 Subject: [PATCH 05/14] Reformat --- .github/workflows/dokka-examples.yml | 24 ++++++++++++------------ .github/workflows/gh-pages-examples.yml | 12 ++++++------ .github/workflows/rebase.yml | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/dokka-examples.yml b/.github/workflows/dokka-examples.yml index becc02864b..f6b673b5be 100644 --- a/.github/workflows/dokka-examples.yml +++ b/.github/workflows/dokka-examples.yml @@ -7,12 +7,12 @@ jobs: strategy: matrix: projects: [ - examples/gradle/dokka-gradle-example, - examples/gradle/dokka-kotlinAsJava-example, - examples/gradle/dokka-library-publishing-example, - examples/gradle/dokka-multimodule-example, - examples/gradle/dokka-multiplatform-example, - examples/gradle/dokka-customFormat-example + examples/gradle/dokka-gradle-example, + examples/gradle/dokka-kotlinAsJava-example, + examples/gradle/dokka-library-publishing-example, + examples/gradle/dokka-multimodule-example, + examples/gradle/dokka-multiplatform-example, + examples/gradle/dokka-customFormat-example ] runs-on: ubuntu-latest steps: @@ -36,11 +36,11 @@ jobs: strategy: matrix: projects: [ - examples/gradle/dokka-gradle-example, - examples/gradle/dokka-kotlinAsJava-example, - examples/gradle/dokka-library-publishing-example, - examples/gradle/dokka-multiplatform-example, - examples/gradle/dokka-customFormat-example + examples/gradle/dokka-gradle-example, + examples/gradle/dokka-kotlinAsJava-example, + examples/gradle/dokka-library-publishing-example, + examples/gradle/dokka-multiplatform-example, + examples/gradle/dokka-customFormat-example ] runs-on: ubuntu-latest steps: @@ -63,7 +63,7 @@ jobs: run-dokka-publishing: strategy: matrix: - tasks: [dokkaJavadocJar, dokkaHtmlJar] + tasks: [ dokkaJavadocJar, dokkaHtmlJar ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/gh-pages-examples.yml b/.github/workflows/gh-pages-examples.yml index f84066c0c5..677fcb322c 100644 --- a/.github/workflows/gh-pages-examples.yml +++ b/.github/workflows/gh-pages-examples.yml @@ -11,11 +11,11 @@ jobs: strategy: matrix: projects: [ - dokka-gradle-example, - dokka-kotlinAsJava-example, - dokka-library-publishing-example, - dokka-multiplatform-example, - dokka-customFormat-example + dokka-gradle-example, + dokka-kotlinAsJava-example, + dokka-library-publishing-example, + dokka-multiplatform-example, + dokka-customFormat-example ] steps: - name: Checkout dokka @@ -85,7 +85,7 @@ jobs: deploy-examples: runs-on: ubuntu-latest - needs: [build-examples, build-multimodule-examples] + needs: [ build-examples, build-multimodule-examples ] steps: - uses: actions/download-artifact@v2 with: diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 1e85385955..76d61a7183 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -1,6 +1,6 @@ on: issue_comment: - types: [created] + types: [ created ] name: Automatic Rebase jobs: rebase: From c7cd9c6e2ae0f0a6abc9a805f855576ad5b36a71 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 12:06:39 +0800 Subject: [PATCH 06/14] Trim blank lines --- .github/workflows/gh-pages-examples.yml | 8 -------- .github/workflows/gh-pages.yml | 6 ------ .github/workflows/s3-cleanup.yml | 1 - .github/workflows/s3-snapshots.yml | 15 --------------- 4 files changed, 30 deletions(-) diff --git a/.github/workflows/gh-pages-examples.yml b/.github/workflows/gh-pages-examples.yml index 677fcb322c..6231917e5d 100644 --- a/.github/workflows/gh-pages-examples.yml +++ b/.github/workflows/gh-pages-examples.yml @@ -26,19 +26,15 @@ jobs: filters: | examples_changed: - 'examples/gradle/${{ matrix.projects }}/**' - - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 - - uses: gradle/gradle-build-action@v2 - - name: Build html run: ./gradlew dokkaHtml --no-daemon --stacktrace working-directory: examples/gradle/${{ matrix.projects }} if: steps.filter.outputs.examples_changed == 'true' - - name: Upload artifact uses: actions/upload-artifact@v2 if: steps.filter.outputs.examples_changed == 'true' @@ -63,19 +59,15 @@ jobs: filters: | examples_changed: - 'examples/gradle/${{ matrix.projects }}/**' - - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 - - uses: gradle/gradle-build-action@v2 - - name: Build html run: ./gradlew dokkaHtmlMultiModule --no-daemon --stacktrace working-directory: examples/gradle/${{ matrix.projects }} if: steps.filter.outputs.examples_changed == 'true' - - name: Upload artifact uses: actions/upload-artifact@v2 if: steps.filter.outputs.examples_changed == 'true' diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 49f2d6446c..632a5d9a81 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -14,7 +14,6 @@ jobs: uses: actions/checkout@v3 with: path: dokka - - uses: dorny/paths-filter@v2 id: filter with: @@ -22,24 +21,19 @@ jobs: docs_changed: - 'docs/**' working-directory: ./dokka - - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 11 - - uses: gradle/gradle-build-action@v2 - - name: Get current dokka version run: echo "DOKKA_VERSION=`./gradlew :properties | grep '^version:.*' | cut -d ' ' -f 2 | cut -d '-' -f 1`" >> $GITHUB_ENV if: steps.filter.outputs.docs_changed == 'true' working-directory: ./dokka - - name: Build docs run: ./gradlew mkdocsBuild -Pdokka_version=$DOKKA_VERSION --info if: steps.filter.outputs.docs_changed == 'true' working-directory: ./dokka - - name: Deploy uses: peaceiris/actions-gh-pages@v3 if: steps.filter.outputs.docs_changed == 'true' diff --git a/.github/workflows/s3-cleanup.yml b/.github/workflows/s3-cleanup.yml index 19876bf2ed..52372f2ccd 100644 --- a/.github/workflows/s3-cleanup.yml +++ b/.github/workflows/s3-cleanup.yml @@ -15,6 +15,5 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: eu-central-1 - - name: Delete branch from s3 run: aws s3 --recursive rm s3://${{ env.bucket-name }}/${{ github.event.ref }} diff --git a/.github/workflows/s3-snapshots.yml b/.github/workflows/s3-snapshots.yml index c8426e21df..b82b9bf622 100644 --- a/.github/workflows/s3-snapshots.yml +++ b/.github/workflows/s3-snapshots.yml @@ -15,29 +15,24 @@ jobs: uses: actions/checkout@v3 with: submodules: true - - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 12 - - name: Document stdlib uses: gradle/gradle-build-action@v2 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 - - 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 }} stdlib ../stdlib - - name: Print link run: echo http://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/stdlib/${GITHUB_SHA::7}/index.html @@ -49,29 +44,24 @@ jobs: 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_IT_AWS_PATH: /home/runner/work/dokka/serialization - - 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 }} serialization ../serialization - - name: Print link run: echo http://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/serialization/${GITHUB_SHA::7}/index.html @@ -83,28 +73,23 @@ jobs: 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_IT_AWS_PATH: /home/runner/work/dokka/biojava - - 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 }} biojava ../biojava - - name: Print link run: echo http://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/biojava/${GITHUB_SHA::7}/index.html From afd0c9c3cbefbfa51ac13c3b831585aabfc1063d Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 12:07:19 +0800 Subject: [PATCH 07/14] Use https --- .github/workflows/s3-snapshots.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/s3-snapshots.yml b/.github/workflows/s3-snapshots.yml index b82b9bf622..2e84050ff8 100644 --- a/.github/workflows/s3-snapshots.yml +++ b/.github/workflows/s3-snapshots.yml @@ -34,7 +34,7 @@ jobs: - name: Copy files to dokka's S3 bucket run: ./integration-tests/aws_sync.sh s3://${{ env.bucket-name }} stdlib ../stdlib - name: Print link - run: echo http://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/stdlib/${GITHUB_SHA::7}/index.html + run: echo https://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/stdlib/${GITHUB_SHA::7}/index.html serialization: runs-on: ubuntu-latest @@ -63,7 +63,7 @@ jobs: - name: Copy files to dokka's S3 bucket run: ./integration-tests/aws_sync.sh s3://${{ env.bucket-name }} serialization ../serialization - name: Print link - run: echo http://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/serialization/${GITHUB_SHA::7}/index.html + run: echo https://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/serialization/${GITHUB_SHA::7}/index.html biojava: runs-on: ubuntu-latest @@ -92,4 +92,4 @@ jobs: - name: Copy files to dokka's S3 bucket run: ./integration-tests/aws_sync.sh s3://${{ env.bucket-name }} biojava ../biojava - name: Print link - run: echo http://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/biojava/${GITHUB_SHA::7}/index.html + run: echo https://dokka-snapshots.s3.eu-central-1.amazonaws.com/${{ env.branch-name }}/biojava/${GITHUB_SHA::7}/index.html From 3abea090655f38a9a32403218fe37362c5aa14d2 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 12:13:38 +0800 Subject: [PATCH 08/14] Cleanup --- .github/workflows/check.yml | 2 +- .github/workflows/gradle-test.pr.yml | 2 +- .github/workflows/rebase.yml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 14b3ac0a80..b632e15c26 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,4 +1,4 @@ -name: CI +name: Check on: pull_request diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml index 46ab765d5d..f24bf477c2 100644 --- a/.github/workflows/gradle-test.pr.yml +++ b/.github/workflows/gradle-test.pr.yml @@ -1,4 +1,4 @@ -name: CI +name: Test on: pull_request diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 76d61a7183..a64526e683 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -1,7 +1,9 @@ +name: Automatic Rebase + on: issue_comment: types: [ created ] -name: Automatic Rebase + jobs: rebase: name: Rebase From 7d5b3c356ee45d6a25134d10229e317f8c42d17c Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 12 Mar 2022 12:14:17 +0800 Subject: [PATCH 09/14] Fix --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b632e15c26..18a343887a 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -19,4 +19,4 @@ jobs: java-version: 11 - uses: gradle/gradle-build-action@v2 with: - arguments: ./gradlew apiCheck --stacktrace + arguments: apiCheck --stacktrace From f4139d8756c635db3d3074bbae80eae55a372050 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 14 Mar 2022 09:46:54 +0800 Subject: [PATCH 10/14] Remove names --- .github/workflows/gh-pages-examples.yml | 6 ++---- .github/workflows/gh-pages.yml | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gh-pages-examples.yml b/.github/workflows/gh-pages-examples.yml index 6231917e5d..a8d80cbf1c 100644 --- a/.github/workflows/gh-pages-examples.yml +++ b/.github/workflows/gh-pages-examples.yml @@ -18,8 +18,7 @@ jobs: dokka-customFormat-example ] steps: - - name: Checkout dokka - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: @@ -51,8 +50,7 @@ jobs: dokka-versioning-multimodule-example ] steps: - - name: Checkout dokka - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 632a5d9a81..eddf177e96 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -10,8 +10,7 @@ jobs: if: github.repository == 'Kotlin/dokka' runs-on: ubuntu-latest steps: - - name: Checkout dokka - uses: actions/checkout@v3 + - uses: actions/checkout@v3 with: path: dokka - uses: dorny/paths-filter@v2 From 78f8391fad76b283701959908b9ebc93b9666891 Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 22 Mar 2022 22:35:12 +0800 Subject: [PATCH 11/14] Cleanup --- .github/workflows/gh-pages-examples.yml | 5 ++--- .github/workflows/gh-pages.yml | 2 +- .github/workflows/rebase.yml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gh-pages-examples.yml b/.github/workflows/gh-pages-examples.yml index a8d80cbf1c..3edf27260d 100644 --- a/.github/workflows/gh-pages-examples.yml +++ b/.github/workflows/gh-pages-examples.yml @@ -4,6 +4,7 @@ on: push: branches: - master + jobs: build-examples: runs-on: ubuntu-latest @@ -46,9 +47,7 @@ jobs: if: github.repository == 'Kotlin/dokka' strategy: matrix: - projects: [ - dokka-versioning-multimodule-example - ] + projects: [ dokka-versioning-multimodule-example ] steps: - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 7dea9cc352..4053325239 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -5,7 +5,7 @@ on: branches: - master release: - types: [published] + types: [ published ] jobs: docs: diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index a64526e683..274421012f 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -15,6 +15,6 @@ jobs: with: fetch-depth: 0 - name: Automatic Rebase - uses: cirrus-actions/rebase@1.5 + uses: cirrus-actions/rebase@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From b0207950135dcb843c44004e2d436c37b8b9f0f3 Mon Sep 17 00:00:00 2001 From: Goooler Date: Wed, 23 Mar 2022 23:31:43 +0800 Subject: [PATCH 12/14] Rename validate to validate-wrapper --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 18a343887a..04b3cb72e0 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -3,7 +3,7 @@ name: Check on: pull_request jobs: - validation: + validate-wrapper: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From ecb4cefe40941cc0f6507eee9664c6d5840d02a1 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 24 Mar 2022 20:47:03 +0800 Subject: [PATCH 13/14] Use cirrus-actions/rebase@v1.5 --- .github/workflows/rebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 274421012f..18e9659aab 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -15,6 +15,6 @@ jobs: with: fetch-depth: 0 - name: Automatic Rebase - uses: cirrus-actions/rebase@v1 + uses: cirrus-actions/rebase@v1.5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 2604544b2fc65e6472ea1139d698109ef8cd37e2 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 24 Mar 2022 20:52:05 +0800 Subject: [PATCH 14/14] Use cirrus-actions/rebase@1.5 --- .github/workflows/rebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 18e9659aab..a64526e683 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -15,6 +15,6 @@ jobs: with: fetch-depth: 0 - name: Automatic Rebase - uses: cirrus-actions/rebase@v1.5 + uses: cirrus-actions/rebase@1.5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file