diff --git a/.github/workflows/common_merge.yaml b/.github/workflows/common_merge.yaml index 540e9dd..b5abaeb 100644 --- a/.github/workflows/common_merge.yaml +++ b/.github/workflows/common_merge.yaml @@ -67,7 +67,7 @@ jobs: # These next two steps will configure CMake if required - name: Build Only Docs if: | - inputs.generate_module_docs == false && inputs.doc_target != 'Sphinx' + inputs.generate_module_docs == 'false' && inputs.doc_target != 'Sphinx' run: | cmake -Bbuild -H. -GNinja -DBUILD_DOCS=ON -DONLY_BUILD_DOCS=ON shell: bash @@ -95,12 +95,12 @@ jobs: shell: bash # Build the C++ Library if building module docs - name: Build Library - if: inputs.generate_module_docs == true + if: inputs.generate_module_docs == 'true' run: cmake --build build --parallel shell: bash # Generate the module docs source files - name: Generate Module Docs - if: inputs.generate_module_docs == true + if: inputs.generate_module_docs == 'true' uses: NWChemEx-Project/.github/actions/generate_module_docs@master with: doc_target: $${{ inputs.doc_target }} diff --git a/.github/workflows/common_pull_request.yaml b/.github/workflows/common_pull_request.yaml index 346b65e..311d330 100644 --- a/.github/workflows/common_pull_request.yaml +++ b/.github/workflows/common_pull_request.yaml @@ -94,7 +94,7 @@ jobs: needs: license_and_format # Only run if no new changes were made above and if compilers isn't empty if: | - needs.license_and_format.outputs.made_changes == false && + needs.license_and_format.outputs.made_changes == 'false' && inputs.compilers != '' && toJson(fromJson(inputs.compilers)) != '[]' runs-on: ubuntu-latest container: @@ -127,10 +127,10 @@ jobs: # Test building the documentation. test_build_docs: needs: license_and_format - # Only run if no new changes were made above - # if: | - # needs.license_and_format.outputs.made_changes == false && - # inputs.doc_target != '' + Only run if no new changes were made above + if: | + needs.license_and_format.outputs.made_changes == 'false' && + inputs.doc_target != '' runs-on: ubuntu-latest container: image: ghcr.io/nwchemex-project/nwx_buildenv:latest @@ -138,30 +138,24 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.CONTAINER_REPO_TOKEN }} steps: - - run: | - echo ${{ needs.license_and_format.outputs.made_changes }} - echo ${{ needs.license_and_format.outputs.made_changes == false }} - echo ${{ inputs.doc_target }} - echo ${{ inputs.doc_target != '' }} - shell: bash - # - uses: actions/checkout@v4 - # - name: Doxygen Docs - # if: ${{ inputs.doc_target != 'Sphinx' }} - # run: | - # cmake -Bbuild -H. -GNinja -DBUILD_DOCS=ON -DONLY_BUILD_DOCS=ON \ - # cmake --build build --target ${{ inputs.doc_target }} --parallel + - uses: actions/checkout@v4 + - name: Doxygen Docs + if: ${{ inputs.doc_target != 'Sphinx' }} + run: | + cmake -Bbuild -H. -GNinja -DBUILD_DOCS=ON -DONLY_BUILD_DOCS=ON \ + cmake --build build --target ${{ inputs.doc_target }} --parallel - # # Migrate the Doxygen documentation to the docs source - # mkdir docs/build - # mkdir docs/build/html - # mv build/html "docs/build/html/${{ inputs.doc_target }}" - # shell: bash - # - name: Sphinx Docs - # run: | - # cd docs - # if [ -f requirements.txt ]; then - # pip install -r requirements.txt - # fi - # make html - # shell: bash + # Migrate the Doxygen documentation to the docs source + mkdir docs/build + mkdir docs/build/html + mv build/html "docs/build/html/${{ inputs.doc_target }}" + shell: bash + - name: Sphinx Docs + run: | + cd docs + if [ -f requirements.txt ]; then + pip install -r requirements.txt + fi + make html + shell: bash \ No newline at end of file