From d575f6be9741a08f6f5b403c81b7d4f02fba2609 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Mon, 2 Mar 2026 16:49:46 +0100 Subject: [PATCH] Fix BaseModelica.jl version for main revision --- .github/scripts/gen_landing_page.py | 7 ++++--- src/pipeline.jl | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/scripts/gen_landing_page.py b/.github/scripts/gen_landing_page.py index 94d6c218..71153d2d 100644 --- a/.github/scripts/gen_landing_page.py +++ b/.github/scripts/gen_landing_page.py @@ -89,11 +89,12 @@ def load_runs(site_root: Path) -> list[dict]: n_cmp = len(cmp_models) n_cmp_pass = sum(1 for m in cmp_models if m["cmp_pass"] == m["cmp_total"]) - run_dir = summary_path.parent - index_url = str((run_dir / "index.html").relative_to(site_root)).replace("\\", "/") + run_dir = summary_path.parent + index_url = str((run_dir / "index.html").relative_to(site_root)).replace("\\", "/") + bm_version_dir = summary_path.relative_to(results_dir).parts[0] runs.append({ - "bm_version": data.get("bm_version", "?"), + "bm_version": bm_version_dir if bm_version_dir == "main" else data.get("bm_version", "?"), "library": data.get("library", "?"), "lib_version": data.get("lib_version", "?"), "omc_version": data.get("omc_version", "?"), diff --git a/src/pipeline.jl b/src/pipeline.jl index a73944ce..46241693 100644 --- a/src/pipeline.jl +++ b/src/pipeline.jl @@ -142,6 +142,8 @@ function main(; end cpu_info = Sys.cpu_info() + bm_ver_env = get(ENV, "BM_VERSION", "") + bm_version = isempty(bm_ver_env) ? string(pkgversion(BaseModelica)) : bm_ver_env info = RunInfo( library, version, @@ -151,7 +153,7 @@ function main(; results_root, ref_root, omc_version, - string(pkgversion(BaseModelica)), + bm_version, isempty(cpu_info) ? "unknown" : strip(cpu_info[1].model), length(cpu_info), Sys.total_memory() / 1024^3,