diff --git a/.github/workflows/build-on-change-linux-bare.yaml b/.github/workflows/build-on-change-linux-bare.yaml index 38148083..2e7f7600 100644 --- a/.github/workflows/build-on-change-linux-bare.yaml +++ b/.github/workflows/build-on-change-linux-bare.yaml @@ -134,6 +134,7 @@ jobs: - name: Execute checker bundles runtime run: | + export ASAM_QC_FRAMEWORK_MANIFEST_DIR=${{ github.workspace }}/.github/workflows/linux-manifest pip install -e ${{ github.workspace }}/runtime diff --git a/.github/workflows/build-on-change-windows.yaml b/.github/workflows/build-on-change-windows.yaml index 36410d85..ae0e35de 100644 --- a/.github/workflows/build-on-change-windows.yaml +++ b/.github/workflows/build-on-change-windows.yaml @@ -169,6 +169,8 @@ jobs: - name: Execute checker bundles runtime run: | + $env:ASAM_QC_FRAMEWORK_MANIFEST_DIR="$env:WORKING_PATH\qc-framework\qc-framework\.github\workflows\windows-manifest" + git config --system core.longpaths true pip install -e $env:WORKING_PATH\qc-framework\qc-framework\runtime diff --git a/.github/workflows/linux-manifest/framework.json b/.github/workflows/linux-manifest/framework.json index 182386fc..28312399 100644 --- a/.github/workflows/linux-manifest/framework.json +++ b/.github/workflows/linux-manifest/framework.json @@ -1,7 +1,7 @@ { "manifest_file_path": [ - "$ASAM_QC_FRAMEWORK_MANIFEST_DIR/.github/workflows/linux-manifest/osc.json", - "${ASAM_QC_FRAMEWORK_MANIFEST_DIR}/.github/workflows/linux-manifest/odr.json", + "$ASAM_QC_FRAMEWORK_MANIFEST_DIR/osc.json", + "${ASAM_QC_FRAMEWORK_MANIFEST_DIR}/odr.json", "/home/runner/work/qc-framework/qc-framework/.github/workflows/linux-manifest/otx.json", "/home/runner/work/qc-framework/qc-framework/.github/workflows/linux-manifest/result_pooling.json", "/home/runner/work/qc-framework/qc-framework/.github/workflows/linux-manifest/text_report.json" diff --git a/.github/workflows/windows-manifest/framework.json b/.github/workflows/windows-manifest/framework.json index 7fbcad2f..721cc919 100644 --- a/.github/workflows/windows-manifest/framework.json +++ b/.github/workflows/windows-manifest/framework.json @@ -1,8 +1,8 @@ { "manifest_file_path": [ - "$ASAM_QC_FRAMEWORK_MANIFEST_DIR\\.github\\workflows\\windows-manifest\\osc.json", - "${ASAM_QC_FRAMEWORK_MANIFEST_DIR}\\.github\\workflows\\windows-manifest\\odr.json", - "%ASAM_QC_FRAMEWORK_MANIFEST_DIR%\\.github\\workflows\\windows-manifest\\otx.json", + "$ASAM_QC_FRAMEWORK_MANIFEST_DIR\\osc.json", + "${ASAM_QC_FRAMEWORK_MANIFEST_DIR}\\odr.json", + "%ASAM_QC_FRAMEWORK_MANIFEST_DIR%\\otx.json", "D:\\a\\qc-framework\\qc-framework\\.github\\workflows\\windows-manifest\\result_pooling.json", "D:\\a\\qc-framework\\qc-framework\\.github\\workflows\\windows-manifest\\text_report.json" ] diff --git a/runtime/runtime/runtime.py b/runtime/runtime/runtime.py index 3092512d..3adb2953 100644 --- a/runtime/runtime/runtime.py +++ b/runtime/runtime/runtime.py @@ -106,7 +106,9 @@ def execute_modules( run_module_command(report_module, config_file_path, output_path) -def execute_runtime(config_file_path: str, manifest_file_path: str, working_dir: str) -> None: +def execute_runtime( + config_file_path: str, manifest_file_path: str, working_dir: str +) -> None: """Execute all runtime operations defined in the input manifest over the defined configuration. @@ -124,8 +126,10 @@ def execute_runtime(config_file_path: str, manifest_file_path: str, working_dir: json_data = framework_manifest_file.read().decode() framework_manifest = models.FrameworkManifest.model_validate_json(json_data) - for module_manifest_path in framework_manifest.manifest_file_path: - with open(module_manifest_path, "rb") as module_manifest_file: + for raw_module_manifest_path in framework_manifest.manifest_file_path: + resolved_module_manifest_path = os.path.expandvars(raw_module_manifest_path) + + with open(resolved_module_manifest_path, "rb") as module_manifest_file: json_data = module_manifest_file.read().decode() module_manifest = models.ModuleManifest.model_validate_json(json_data)