From f4e999e0ec06be0cc2d19033b547f8082946070e Mon Sep 17 00:00:00 2001 From: acpaquette <acpaquette@usgs.gov> Date: Wed, 30 Aug 2023 15:12:38 -0700 Subject: [PATCH] Fixed up workflows --- .github/workflows/aws_doc_deploy.yml | 2 +- .github/workflows/ci_testing.yml | 33 ---------------------------- .github/workflows/doc_build.yml | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/.github/workflows/aws_doc_deploy.yml b/.github/workflows/aws_doc_deploy.yml index 8b190ca..0f64442 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: ["Pull-Request-CI/Build-Docs"] + workflows: ["Doc-Build"] branches: [main] types: - completed diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index e276902..803fe84 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -44,36 +44,3 @@ 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 - - - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce - with: - name: docs_folder - path: docs/public/ \ No newline at end of file diff --git a/.github/workflows/doc_build.yml b/.github/workflows/doc_build.yml index 5d0747b..0bb3abe 100644 --- a/.github/workflows/doc_build.yml +++ b/.github/workflows/doc_build.yml @@ -1,4 +1,4 @@ -name: Doc-Build-Upload +name: Doc-Build on: pull_request: -- GitLab