GHA: Fixup GHA CI documentation locations after recent changes

dlmiles · Sep 2, 2024 · 9565b17 · 9565b17
1 parent ee36b3d
commit 9565b17
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -73,10 +73,10 @@ jobs:
         run: ./gradlew $GRADLE_EXTRA_ARGS integrationTest
 
       - name: Gradle - asciidoctor
-        run: ./gradlew $GRADLE_EXTRA_ARGS asciidoctor
+        run: ./gradlew $GRADLE_EXTRA_ARGS asciidoctor && find docs/build/docs/asciidoctor
 
       - name: Gradle - dokka
-        run: ./gradlew $GRADLE_EXTRA_ARGS dokka
+        run: ./gradlew $GRADLE_EXTRA_ARGS dokka && find docs/build/dokka
 
       - name: Gradle - publish
         run: ./gradlew $GRADLE_EXTRA_ARGS publish
@@ -98,8 +98,8 @@ jobs:
 
           docs_build_dir="build"
           [ -d docs/build ] && docs_build_dir="docs/build" || true
-          cp -a $docs_build_dir/asciidoc/html5/* build/gh-pages/
-          cp -a $docs_build_dir/dokka build/gh-pages/
+          cp -a $docs_build_dir/docs/asciidoc/* build/gh-pages/
+          cp -a $docs_build_dir/dokka           build/gh-pages/
 
           mkdir -p build/gh-pages/maven2
           cp -a build/repo/* build/gh-pages/maven2/

diff --git a/.github/workflows/canary-build.yml b/.github/workflows/canary-build.yml
@@ -258,11 +258,11 @@ jobs:
 
       - name: Gradle - asciidoctor
         if: false  # needs fixing for 7.x
-        run: ./gradlew $GRADLE_EXTRA_ARGS asciidoctor
+        run: ./gradlew $GRADLE_EXTRA_ARGS asciidoctor && find docs/build/docs/asciidoctor
 
       - name: Gradle - dokka
         if: false  # needs fixing for 7.x
-        run: ./gradlew $GRADLE_EXTRA_ARGS dokka
+        run: ./gradlew $GRADLE_EXTRA_ARGS dokka && find docs/build/dokka
 
       - name: Gradle - publish
         run: ./gradlew $GRADLE_EXTRA_ARGS publish
@@ -293,8 +293,8 @@ jobs:
 
           docs_build_dir="build"
           [ -d docs/build ] && docs_build_dir="docs/build" || true
-          [ -d $docs_build_dir/asciidoc/html5 ] && cp -a $docs_build_dir/asciidoc/html5/* build/gh-pages/
-          [ -d $docs_build_dir/dokka          ] && cp -a $docs_build_dir/dokka            build/gh-pages/
+          [ -d $docs_build_dir/docs/asciidoc ] && cp -a $docs_build_dir/docs/asciidoc/* build/gh-pages/
+          [ -d $docs_build_dir/dokka         ] && cp -a $docs_build_dir/dokka           build/gh-pages/
 
           mkdir -p build/gh-pages/maven2
           [ -d "build/repo" ] && cp -a build/repo/* build/gh-pages/maven2/

diff --git a/.github/workflows/canary-consume.yml b/.github/workflows/canary-consume.yml
@@ -120,10 +120,10 @@ jobs:
         run: ./gradlew $GRADLE_EXTRA_ARGS "-Dorg.unbrokendome.gradle.plugins.xjc.testutil.GradleVersions=${GRADLE_VERSION}" integrationTest
 
       - name: Gradle - asciidoctor
-        run: ./gradlew $GRADLE_EXTRA_ARGS asciidoctor
+        run: ./gradlew $GRADLE_EXTRA_ARGS asciidoctor && find docs/build/docs/asciidoctor
 
       - name: Gradle - dokka
-        run: ./gradlew $GRADLE_EXTRA_ARGS dokka
+        run: ./gradlew $GRADLE_EXTRA_ARGS dokka && find docs/build/dokka
 
       - name: Gradle - publish
         run: ./gradlew $GRADLE_EXTRA_ARGS publish
@@ -154,8 +154,8 @@ jobs:
 
           docs_build_dir="build"
           [ -d docs/build ] && docs_build_dir="docs/build" || true
-          [ -d $docs_build_dir/asciidoc/html5 ] && cp -a $docs_build_dir/asciidoc/html5/* build/gh-pages/
-          [ -d $docs_build_dir/dokka          ] && cp -a $docs_build_dir/dokka            build/gh-pages/
+          [ -d $docs_build_dir/docs/asciidoc ] && cp -a $docs_build_dir/docs/asciidoc/* build/gh-pages/
+          [ -d $docs_build_dir/dokka         ] && cp -a $docs_build_dir/dokka           build/gh-pages/
 
           mkdir -p build/gh-pages/maven2
           [ -d "build/repo" ] && cp -a build/repo/* build/gh-pages/maven2/
@@ -466,8 +466,8 @@ jobs:
 
           docs_build_dir="build"
           [ -d docs/build ] && docs_build_dir="docs/build" || true
-          [ -d $docs_build_dir/asciidoc/html5 ] && cp -a $docs_build_dir/asciidoc/html5/* build/gh-pages/
-          [ -d $docs_build_dir/dokka          ] && cp -a $docs_build_dir/dokka            build/gh-pages/
+          [ -d $docs_build_dir/docs/asciidoc ] && cp -a $docs_build_dir/docs/asciidoc/* build/gh-pages/
+          [ -d $docs_build_dir/dokka         ] && cp -a $docs_build_dir/dokka           build/gh-pages/
 
           mkdir -p build/gh-pages/maven2
           [ -d "build/repo" ] && cp -a build/repo/* build/gh-pages/maven2/

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -176,11 +176,11 @@ jobs:
 
     - name: Gradle - asciidoctor
       run: |
-        ./gradlew $GRADLE_EXTRA_ARGS asciidoctor
+        ./gradlew $GRADLE_EXTRA_ARGS asciidoctor && find docs/build/docs/asciidoctor
 
     - name: Gradle - dokka
       run: |
-        ./gradlew $GRADLE_EXTRA_ARGS dokka
+        ./gradlew $GRADLE_EXTRA_ARGS dokka && find docs/build/dokka
 
     - name: Gradle - publish local
       run: |

diff --git a/README.adoc b/README.adoc
@@ -130,7 +130,7 @@ it the `main` Java compilation.
 == Further Documentation
 
 * {github-pages-uri}/[User Manual]
-* {github-pages-uri}/dokka/gradle-xjc-plugin/[API/DSL Documentation]
+* {github-pages-uri}/dokka/docs/[API/DSL Documentation]
 * {github-m2-uri}/[Github Maven2 Package Browse]
 * {github-pages-uri}/java8/maven2/[Github-Pages Maven2 Artifact Browse]
 * {github-pages-uri}/artifacts/[Maven2 Artifact Archive Download]