diff --git a/.github/workflows/deploy_docs.yaml b/.github/workflows/deploy_docs.yaml deleted file mode 100644 index 53e8787a9..000000000 --- a/.github/workflows/deploy_docs.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: Build and Deploy Documentation -on: - push: - branches: - - master - -jobs: - Build-Documentation: - uses: NWChemEx-Project/.github/.github/workflows/deploy_docs_tmpl.yaml@master - with: - target: pluginplay_cxx_api - dependencies: cmake doxygen sphinx - diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml deleted file mode 100644 index 04908e81e..000000000 --- a/.github/workflows/format.yaml +++ /dev/null @@ -1,9 +0,0 @@ -name: Run clang-format Linter - -on: [push] - -jobs: - build: - uses: NWChemEx-Project/.github/.github/workflows/format_tmpl.yaml@master - with: - source: 'include src tests' diff --git a/.github/workflows/add_licenses.yaml b/.github/workflows/merge.yaml similarity index 69% rename from .github/workflows/add_licenses.yaml rename to .github/workflows/merge.yaml index 682cb95a8..f7fe36222 100644 --- a/.github/workflows/add_licenses.yaml +++ b/.github/workflows/merge.yaml @@ -1,4 +1,4 @@ -# Copyright 2021 NWChemEx-Project +# Copyright 2023 NWChemEx-Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,17 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -name: Add Licenses + +name: .github Merge Workflow on: - pull_request: + push: branches: - master jobs: - license_files: - uses: NWChemEx-Project/.github/.github/workflows/add_licenses_master.yaml@master + Common-Merge: + uses: NWChemEx-Project/.github/.github/workflows/common_merge.yaml@master with: - config_file: .github/.licenserc.yaml - secrets: - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + doc_target: 'pluginplay_cxx_api' + generate_module_docs: false + secrets: inherit diff --git a/.github/workflows/tag_and_release.yaml b/.github/workflows/pull_request.yaml similarity index 53% rename from .github/workflows/tag_and_release.yaml rename to .github/workflows/pull_request.yaml index 5aff45c72..c9e276bfb 100644 --- a/.github/workflows/tag_and_release.yaml +++ b/.github/workflows/pull_request.yaml @@ -1,4 +1,4 @@ -# Copyright 2021 NWChemEx +# Copyright 2023 NWChemEx-Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,23 +12,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -name: Tag and Release + +name: .github Pull Request Workflow on: - push: + pull_request: branches: - master jobs: - tag: - uses: NWChemEx-Project/.github/.github/workflows/tag_and_release_master.yaml@master - secrets: - token: ${{ secrets.TAG_TOKEN }} - # release: - # needs: tag - # if: | - # (needs.tag.outputs.bumped_major == 'true') || - # (needs.tag.outputs.bumped_minor == 'true') - # uses: NWChemEx-Project/.github/.github/workflows/pypi_release_master.yaml@automate-versioning - # secrets: - # token: ${{ secrets.PYPI_API_TOKEN }} \ No newline at end of file + Common-Pull-Request: + uses: NWChemEx-Project/.github/.github/workflows/common_pull_request.yaml@master + with: + config_file: '.github/.licenserc.yaml' + source_dir: 'include src tests' + compilers: '["gcc-11", "clang-11"]' + doc_target: 'pluginplay_cxx_api' + secrets: inherit diff --git a/.github/workflows/test_docs.yaml b/.github/workflows/test_docs.yaml deleted file mode 100644 index 788f8c1c5..000000000 --- a/.github/workflows/test_docs.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: Test Documentation -on: - pull_request: - branches: - - master - -jobs: - Build-Documentation: - uses: NWChemEx-Project/.github/.github/workflows/test_docs_tmpl.yaml@master - with: - target: pluginplay_cxx_api - dependencies: cmake doxygen sphinx diff --git a/CMakeLists.txt b/CMakeLists.txt index 03a8eb30a..d5a57e655 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,8 +169,8 @@ if("${BUILD_TESTING}") cmaize_add_tests( test_integration_${PROJECT_NAME} SOURCE_DIR "${cxx_test_dir}/integration_tests" - INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/src/${PROJECT_NAME}" - DEPENDS Catch2::Catch2 ${PROJECT_NAME} ${PROJECT_NAME}_examples + INCLUDE_DIRS "${cxx_test_dir}/integration_tests" + DEPENDS Catch2::Catch2 ) cmaize_add_tests( test_${PROJECT_NAME}_docs