diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index 74b3366..1ddd02b 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -13,7 +13,7 @@ # limitations under the License. # -name: .github Merge Workflow +name: Merge Workflow on: push: @@ -21,9 +21,13 @@ on: - master jobs: - Common-Merge: - uses: NWChemEx/.github/.github/workflows/common_merge.yaml@master - with: - doc_target: '' - generate_module_docs: true + tag-commit: + uses: NWChemEx/.github/.github/workflows/tag.yaml@master secrets: inherit + + # deploy_nwx_docs: + # uses: NWChemEx/.github/.github/workflows/deploy_nwx_docs.yaml@master + # with: + # doc_target: "Sphinx" + # generate_module_docs: true + # secrets: inherit diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 71746a6..80bb11a 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -13,7 +13,7 @@ # limitations under the License. # -name: .github Pull Request Workflow +name: Pull Request Workflow on: pull_request: @@ -21,11 +21,19 @@ on: - master jobs: - Common-Pull-Request: - uses: NWChemEx/.github/.github/workflows/common_pull_request.yaml@master + check_formatting: + uses: NWChemEx/.github/.github/workflows/check_formatting.yaml@master + with: + license_config: ".github/.licenserc.yaml" + cpp_source_dirs: "" + + # test_nwx_docs: + # uses: NWChemEx/.github/.github/workflows/test_nwx_docs.yaml@master + # with: + # doc_target: "Sphinx" + + test_library: + uses: NWChemEx/.github/.github/workflows/test_nwx_library.yaml@master with: - config_file: '.github/.licenserc.yaml' - source_dir: '' compilers: '["gcc-11", "clang-14"]' - doc_target: '' - secrets: inherit +