diff --git a/.github/workflows/common_merge.yaml b/.github/workflows/common_merge.yaml index d50a1a6..97a0455 100644 --- a/.github/workflows/common_merge.yaml +++ b/.github/workflows/common_merge.yaml @@ -21,6 +21,11 @@ name: Common Merge Workflow on: workflow_call: inputs: + bump_tag: + description: "Whether or not to bump the tag of the commit" + type: booolean + required: false + default: true doc_target: description: "The name of the documentation target. Set to 'Sphinx' to skip doxygen" type: string @@ -44,6 +49,7 @@ on: jobs: # Bump the version tag bump_tag: + if: inputs.bump_tag == true runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/nwx_build_environment/scripts/generate_module_dox.py b/nwx_build_environment/scripts/generate_module_dox.py index b87a447..e83b5d1 100644 --- a/nwx_build_environment/scripts/generate_module_dox.py +++ b/nwx_build_environment/scripts/generate_module_dox.py @@ -1,7 +1,7 @@ import os +import glob import sys import importlib - """This script will generate the module api documentation for a plugin library. Usage @@ -30,9 +30,15 @@ # Add paths to libraries cwd = os.getcwd() build_dir = os.path.join(cwd, "build") - pluginplay_dir = os.path.join(cwd, "build", "_deps", "pluginplay-build") sys.path.append(build_dir) - sys.path.append(pluginplay_dir) + + pythonsrc_dir = os.path.join(cwd, "src", "python") + sys.path.append(pythonsrc_dir) + + deps_dir = os.path.join(cwd, "build", "_deps") + deps_builds = glob.glob("*-build/", root_dir=deps_dir) + for build in deps_builds: + sys.path.append(os.path.join(deps_dir, build)) # Exit on any exception try: @@ -47,4 +53,3 @@ except Exception as e: print(f"An exception caught: {e}") sys.exit() -