Merge pull request #322 from NWChemEx-Project/ci_update

Use New CI Workflows

.github/workflows/add_licenses.yaml → .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 }}
+      doc_target: 'pluginplay_cxx_api'
+      generate_module_docs: false
+    secrets: inherit

.github/workflows/tag_and_release.yaml → .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 }}
+  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

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