From 2d6ec03a48122075ae571619aab39dfc4c957359 Mon Sep 17 00:00:00 2001 From: acpaquette <acpaquette@usgs.gov> Date: Wed, 30 Aug 2023 16:35:22 -0700 Subject: [PATCH] Changed docs to build in deploy and in CI --- .github/workflows/aws_doc_deploy.yml | 20 +++++++++++++++++--- .github/workflows/ci_testing.yml | 28 ++++++++++++++++++++++++++++ .github/workflows/doc_build.yml | 5 ----- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/.github/workflows/aws_doc_deploy.yml b/.github/workflows/aws_doc_deploy.yml index 1474788..b5566bc 100644 --- a/.github/workflows/aws_doc_deploy.yml +++ b/.github/workflows/aws_doc_deploy.yml @@ -2,7 +2,7 @@ name: aws-doc-deploy on: workflow_run: - workflows: ["Doc-Build"] + workflows: ["Pull-Request-CI"] branches: [main] types: - completed @@ -19,9 +19,23 @@ jobs: with: submodules: true fetch-depth: 0 - - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a + - uses: conda-incubator/setup-miniconda@3b0f2504dd76ef23b6d31f291f4913fb60ab5ff3 with: - name: docs_folder + miniconda-version: "latest" + activate-environment: usgscsm + environment-file: doc_environment.yml + auto-activate-base: false + auto-update-conda: true + + - name: Check doc build environment + run: | + conda list + + - name: Build Docs + run: | + cd docs + doxygen Doxyfile.in + sphinx-build -b html source public - name: Set AWS credentials for upload uses: aws-actions/configure-aws-credentials@0e613a0980cbf65ed5b322eb7a1e075d28913a83 diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index 803fe84..d90c5b7 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -44,3 +44,31 @@ jobs: run: | cd build ctest -VV + + Build-Docs: + runs-on: ubuntu-latest + defaults: + run: + shell: bash -el {0} + steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + with: + submodules: true + fetch-depth: 0 + - uses: conda-incubator/setup-miniconda@3b0f2504dd76ef23b6d31f291f4913fb60ab5ff3 + with: + miniconda-version: "latest" + activate-environment: usgscsm + environment-file: doc_environment.yml + auto-activate-base: false + auto-update-conda: true + + - name: Check doc build environment + run: | + conda list + + - name: Build Docs + run: | + cd docs + doxygen Doxyfile.in + sphinx-build -b html source public diff --git a/.github/workflows/doc_build.yml b/.github/workflows/doc_build.yml index 0bb3abe..e07edbb 100644 --- a/.github/workflows/doc_build.yml +++ b/.github/workflows/doc_build.yml @@ -36,8 +36,3 @@ jobs: cd docs doxygen Doxyfile.in sphinx-build -b html source public - - - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce - with: - name: docs_folder - path: docs/public/ \ No newline at end of file -- GitLab