diff --git a/.github/workflows/build_doc_arrow-integrations.yml b/.github/workflows/build_doc_arrow-integrations.yml index c0f2703..f55141d 100644 --- a/.github/workflows/build_doc_arrow-integrations.yml +++ b/.github/workflows/build_doc_arrow-integrations.yml @@ -21,21 +21,5 @@ jobs: with: java-version: 1.8 architecture: x64 - - name: Checkout orchestrator - run: | - cd $BASEDIR - git clone https://github.com/arrow-kt/arrow.git - - name: Run Ank for site - run: | - $BASEDIR/arrow/scripts/site-download.sh - $BASEDIR/arrow/scripts/site-run-ank.sh - - name: Run Dokka for arrow-integrations - run: $BASEDIR/arrow/scripts/project-run-dokka.sh arrow-integrations - - name: Run Ank for arrow-integrations - run: $BASEDIR/arrow/scripts/project-run-ank.sh arrow-integrations - - name: Join docs to site - run: $BASEDIR/arrow/scripts/project-locate-doc.sh arrow-integrations - - name: Prepare environment - run: $BASEDIR/arrow/scripts/site-prepare-env.sh - - name: Build site - run: $BASEDIR/arrow/scripts/site-build.sh + - name: Generate API doc and validate + run: ./gradlew buildArrowDoc diff --git a/.github/workflows/check_build_integration.yml b/.github/workflows/check_build_integration.yml index 48ca553..4854e90 100644 --- a/.github/workflows/check_build_integration.yml +++ b/.github/workflows/check_build_integration.yml @@ -25,14 +25,8 @@ jobs: if: failure() id: create-issue run: | - echo $(git log -1 --pretty=format:%s) + $BASEDIR/arrow/scripts/issue-create-description.sh > issue.log echo ::set-output name=title::$(git log -1 --pretty=format:%s) - echo -e "## Details\n" > issue.log - echo -e "* **Commit hash**: \`$(git log -1 --pretty=format:%h)\`\n" >> issue.log - echo -e "* **Author**: $(git log -1 --pretty=format:%an)\n" >> issue.log - echo -e "* **Committer**: $(git log -1 --pretty=format:%cn)\n" >> issue.log - echo -e "* **More info**: [error log](https://github.com/arrow-kt/arrow-integrations/commit/$GITHUB_SHA/checks)\n" >> issue.log - cat issue.log rm -rf /home/runner/work/_actions/actions/github-script/0.3.0/node_modules cd /home/runner/work/_actions/actions/github-script/0.3.0/ npm install diff --git a/.github/workflows/check_doc_integration.yml b/.github/workflows/check_doc_integration.yml index d473b5d..9ef7d5f 100644 --- a/.github/workflows/check_doc_integration.yml +++ b/.github/workflows/check_doc_integration.yml @@ -25,14 +25,8 @@ jobs: if: failure() id: create-issue run: | - echo $(git log -1 --pretty=format:%s) + $BASEDIR/arrow/scripts/issue-create-description.sh > issue.log echo ::set-output name=title::$(git log -1 --pretty=format:%s) - echo -e "## Details\n" > issue.log - echo -e "* **Commit hash**: \`$(git log -1 --pretty=format:%h)\`\n" >> issue.log - echo -e "* **Author**: $(git log -1 --pretty=format:%an)\n" >> issue.log - echo -e "* **Committer**: $(git log -1 --pretty=format:%cn)\n" >> issue.log - echo -e "* **More info**: [error log](https://github.com/arrow-kt/arrow-integrations/commit/$GITHUB_SHA/checks)\n" >> issue.log - cat issue.log rm -rf /home/runner/work/_actions/actions/github-script/0.3.0/node_modules cd /home/runner/work/_actions/actions/github-script/0.3.0/ npm install diff --git a/.github/workflows/publish_arrow-integrations.yml b/.github/workflows/publish_arrow-integrations.yml index 8cbe849..2894983 100644 --- a/.github/workflows/publish_arrow-integrations.yml +++ b/.github/workflows/publish_arrow-integrations.yml @@ -38,14 +38,8 @@ jobs: if: failure() id: create-issue run: | - echo $(git log -1 --pretty=format:%s) + $BASEDIR/arrow/scripts/issue-create-description.sh > issue.log echo ::set-output name=title::$(git log -1 --pretty=format:%s) - echo -e "## Details\n" > issue.log - echo -e "* **Commit hash**: \`$(git log -1 --pretty=format:%h)\`\n" >> issue.log - echo -e "* **Author**: $(git log -1 --pretty=format:%an)\n" >> issue.log - echo -e "* **Committer**: $(git log -1 --pretty=format:%cn)\n" >> issue.log - echo -e "* **More info**: [error log](https://github.com/arrow-kt/arrow-integrations/commit/$GITHUB_SHA/checks)\n" >> issue.log - cat issue.log rm -rf /home/runner/work/_actions/actions/github-script/0.3.0/node_modules cd /home/runner/work/_actions/actions/github-script/0.3.0/ npm install diff --git a/.github/workflows/publish_doc_arrow-integrations.yml b/.github/workflows/publish_doc_arrow-integrations.yml index 140905b..44eb0b9 100644 --- a/.github/workflows/publish_doc_arrow-integrations.yml +++ b/.github/workflows/publish_doc_arrow-integrations.yml @@ -29,10 +29,8 @@ jobs: run: | $BASEDIR/arrow/scripts/site-download.sh $BASEDIR/arrow/scripts/site-run-ank.sh - - name: Run Dokka for arrow-integrations - run: $BASEDIR/arrow/scripts/project-run-dokka.sh arrow-integrations - - name: Run Ank for arrow-integrations - run: $BASEDIR/arrow/scripts/project-run-ank.sh arrow-integrations + - name: Generate API doc and validate + run: ./gradlew buildArrowDoc - name: Join docs to site run: $BASEDIR/arrow/scripts/project-locate-doc.sh arrow-integrations - name: Prepare environment @@ -52,14 +50,8 @@ jobs: if: failure() id: create-issue run: | - echo $(git log -1 --pretty=format:%s) + $BASEDIR/arrow/scripts/issue-create-description.sh > issue.log echo ::set-output name=title::$(git log -1 --pretty=format:%s) - echo -e "## Details\n" > issue.log - echo -e "* **Commit hash**: \`$(git log -1 --pretty=format:%h)\`\n" >> issue.log - echo -e "* **Author**: $(git log -1 --pretty=format:%an)\n" >> issue.log - echo -e "* **Committer**: $(git log -1 --pretty=format:%cn)\n" >> issue.log - echo -e "* **More info**: [error log](https://github.com/arrow-kt/arrow-integrations/commit/$GITHUB_SHA/checks)\n" >> issue.log - cat issue.log rm -rf /home/runner/work/_actions/actions/github-script/0.3.0/node_modules cd /home/runner/work/_actions/actions/github-script/0.3.0/ npm install diff --git a/settings.gradle b/settings.gradle index 8298985..4d06a56 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,4 +2,3 @@ rootProject.name = 'arrow-integrations-lib' include 'arrow-integrations-jackson-module' include 'arrow-integrations-retrofit-adapter' -include 'arrow-docs'