diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index 73ccf70..575e8d2 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 + 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: 'scf_cxx_api' + doc_target: "scf_cxx_api" generate_module_docs: true secrets: inherit diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index a282501..99eeddb 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,29 +21,30 @@ on: - master jobs: - default_build: - 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" + + test_nwx_docs: + uses: NWChemEx/.github/.github/workflows/test_nwx_docs.yaml@master + with: + doc_target: "scf_cxx_api" + + test_library: + uses: NWChemEx/.github/.github/workflows/test_nwx_library.yaml@master with: - config_file: '.github/.licenserc.yaml' - source_dir: 'include src tests' compilers: '["gcc-11", "clang-14"]' - doc_target: 'scf_cxx_api' - secrets: inherit + integration_tests: - uses: NWChemEx/.github/.github/workflows/common_pull_request.yaml@master + 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: '' repo_toolchain: '.github/integration_testing.cmake' - secrets: inherit + # tamm_tests: - # uses: NWChemEx/.github/.github/workflows/common_pull_request.yaml@master + # uses: NWChemEx/.github/.github/workflows/test_nwx_library.yaml@master # with: - # config_file: '.github/.licenserc.yaml' - # source_dir: '' # compilers: '["gcc-11"]' - # doc_target: '' # repo_toolchain: '.github/tamm_testing.cmake' - # secrets: inherit + \ No newline at end of file