From d741f43e4696d67008c3b081a3b18dbf5328b690 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Sat, 23 Nov 2024 16:49:48 +0100 Subject: [PATCH 1/2] do not fail if is already linked --- .CI/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index fa3a565..2891d0e 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -804,7 +804,8 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om export PREVIOUSHOME="${env.HOME}" export HOME="${libraryPath}" # we need to do some crap magic here to make sure python3 finds fmpy as we change the HOME here - ln -s -t \${HOME} \${PREVIOUSHOME}/.local .local + # too bad if we cannot do it, just continue + ln -s -t \${HOME} \${PREVIOUSHOME}/.local .local || true cd OpenModelicaLibraryTesting # Force /usr/bin/omc as being used for generating the mos-files. Ensures consistent behavior among all tested OMC versions From b527fb4e2866abf77985e7cef03e53054463c687 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Sat, 23 Nov 2024 16:59:53 +0100 Subject: [PATCH 2/2] fix bad key in template --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index e643fcf..19b550f 100755 --- a/test.py +++ b/test.py @@ -1075,7 +1075,7 @@ def cpu_name(): replacements = ( (u"#sysInfo#", html.escape(sysInfo)), (u"#omcVersion#", html.escape(omc_version)), - (u"#fmiVersion#", ("

"+html.escape("FMI tool: %s" % fmisimulatorversion)+"

") if fmisimulatorversion else ""), + (u"#fmiToolVersion#", ("

"+html.escape("FMI tool: %s" % fmisimulatorversion)+"

") if fmisimulatorversion else ""), (u"#fmi#", ("

"+html.escape("FMI version: %s" % conf.get("fmi"))+"

") if conf.get("fmi") else ""), (u"#optlevel#", html.escape(conf.get("optlevel")) if (canChangeOptLevel and conf.get("optlevel")) else "Tool default"), (u"#timeStart#", html.escape(time.strftime('%Y-%m-%d %H:%M:%S', start_as_time))),