From e68dfb1d2e6e3b47c0fe62c00e65ebeab067497a Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:42:33 +0200 Subject: [PATCH 1/2] Adding URDFModelica to installLibraries.mos - Reordered install loops to do all in one loop --- .CI/installLibraries.mos | 74 +++++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 17 deletions(-) diff --git a/.CI/installLibraries.mos b/.CI/installLibraries.mos index 8bd2f07..6a5d506 100644 --- a/.CI/installLibraries.mos +++ b/.CI/installLibraries.mos @@ -19,22 +19,23 @@ for v in {"1.6", "3.0.0", "maint.7.0.x", "maint.8.1.x", "maint.9.1.x", "maint.10 end if; end for; -for lib in {"AdvancedNoise", "BioChem", "BuildingSystems", "BuildSysPro", "Chemical", "ConPNlib", "ElectricalEnergyStorage", "ExternData", "ExternalMemoryLib", "FastBuildings", "FCSys", "Greenhouses", "HanserModelica", "HelmholtzMedia", "IBPSA", "IdealizedContact", "IndustrialControlSystems", "KeyWordIO", "LargeTestSuite", "LibRAS", "MEV", "MessagePack", "ModelicaByExample", "ModelicaTestOverdetermined", "Modelica_Synchronous", "Modelica_DeviceDrivers", "Modelica_LinearSystems2", "Modelica_Noise", "ObjectStab", "OpenIPSL", "PNlib", "Physiolibrary", "PlanarMechanics", "PowerSysPro", "ScalableTestGrids", "ScalableTestSuite", "SolarTherm", "Spot", "SystemDynamics", "TAeZoSysPro", "TAeZoSysPro_testsuite", "ThermalSeparation", "ThermoPower", "ThermoSysPro", "TransiEnt", "VehicleInterfaces"} loop - if not installPackage(stringTypeName(lib), "master") then - print(lib + " " + getErrorString() + "\n"); - exit(1); - end if; -end for; - for l in { + {"AdvancedNoise", "master"}, {"AES", "main"}, {"AixLib", "main"}, {"Annex60", ""}, {"BidiDCDC", ""}, + {"BioChem", "master"}, {"BLDC", ""}, {"BoundaryInitBlocks", "master"}, + {"BuildingSystems", "master"}, + {"BuildSysPro", "master"}, {"BusinessSimulation", ""}, {"BusinessSimulation", "main"}, + {"Chemical", "master"}, + {"ClaRa", ""}, + {"ClaRa", "main"}, + {"ConPNlib", "master"}, {"Credibility", ""}, {"DeltaRobot", ""}, {"DroneLibrary", ""}, @@ -44,36 +45,75 @@ for l in { {"EHPTexamples", "main"}, {"EHPTlib", ""}, {"EHPTlib", "main"}, + {"ElectricalEnergyStorage", "master"}, {"ExtendedPetriNets", ""}, {"ExternalMedia",""}, + {"ExternalMemoryLib", "master"}, + {"ExternData", "master"}, + {"FastBuildings", "master"}, + {"FCSys", "master"}, {"FluxTubesExtension","main"}, + {"Greenhouses", "master"}, + {"HanserModelica", "master"}, + {"HelmholtzMedia", "master"}, + {"IBPSA", "master"}, + {"IdealizedContact", "master"}, {"IDEAS", ""}, {"IDEAS", "master"}, + {"IndustrialControlSystems", "master"}, {"iPSL", ""}, + {"KeyWordIO", "master"}, + {"LargeTestSuite", "master"}, + {"LibRAS", "master"}, {"MagLev", ""}, + {"MessagePack", "master"}, + {"MEV", "master"}, + {"Modelica_DeviceDrivers", "master"}, + {"Modelica_LinearSystems2", "dev"}, + {"Modelica_LinearSystems2", "master"}, + {"Modelica_Noise", "master"}, + {"Modelica_StateGraph2", ""}, + {"Modelica_Synchronous", "master"}, + {"ModelicaByExample", "master"}, + {"ModelicaTestOverdetermined", "master"}, + {"ObjectStab", "master"}, {"OpenHydraulics", "main"}, {"OpenIMDML", "main"}, - {"OpenIPSL", "2.0.0"}, {"OpenIPSL", ""}, + {"OpenIPSL", "2.0.0"}, + {"OpenIPSL", "master"}, {"OpenIPSL", "master"}, - {"PhotoVoltaics", ""}, {"PhotoVoltaics_TGM", ""}, - {"PowerSystems","master"}, - {"PowerSystems",""}, + {"PhotoVoltaics", ""}, + {"Physiolibrary", "master"}, + {"Physiomodel", ""}, + {"PlanarMechanics", "master"}, + {"PNlib", "master"}, {"PowerGrids",""}, {"PowerGrids","develop"}, + {"PowerSysPro", "master"}, + {"PowerSystems",""}, + {"PowerSystems","master"}, + {"ScalableTestGrids", "master"}, + {"ScalableTestSuite", "master"}, {"SiemensPower",""}, {"SiemensPower","OMCtest"}, - {"StewartPlatform",""}, {"SOFCPoliMi","master"}, - {"Modelica_LinearSystems2", "dev"}, - {"Modelica_StateGraph2", ""}, - {"Physiomodel", ""}, + {"SolarTherm", "master"}, + {"Spot", "master"}, + {"StewartPlatform",""}, + {"SystemDynamics", "master"}, + {"TAeZoSysPro_testsuite", "master"}, + {"TAeZoSysPro", "master"}, + {"ThermalSeparation", "master"}, {"ThermofluidStream", ""}, {"ThermofluidStream", "main"}, + {"ThermoPower", "master"}, + {"ThermoSysPro", "master"}, {"TILMedia", "main"}, - {"ClaRa", ""}, - {"ClaRa", "main"} + {"TransiEnt", "master"}, + {"VehicleInterfaces", "master"}, + {"URDFModelica", "master"} } loop if not installPackage(stringTypeName(l[1]), l[2]) then print(l[1] + " " + l[2] + getErrorString() + "\n"); From 1ed4318a376e5aa9da9528ff0b06498b4331249f Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:47:13 +0200 Subject: [PATCH 2/2] Fixing wrong branch, removing duplicate - URDFModelica uses main branch - Removing duplicate entry for OpenIPSL Reviewed by CodeRabbit[ai] --- .CI/installLibraries.mos | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.CI/installLibraries.mos b/.CI/installLibraries.mos index 6a5d506..0b4dd41 100644 --- a/.CI/installLibraries.mos +++ b/.CI/installLibraries.mos @@ -82,7 +82,6 @@ for l in { {"OpenIPSL", ""}, {"OpenIPSL", "2.0.0"}, {"OpenIPSL", "master"}, - {"OpenIPSL", "master"}, {"PhotoVoltaics_TGM", ""}, {"PhotoVoltaics", ""}, {"Physiolibrary", "master"}, @@ -113,7 +112,7 @@ for l in { {"TILMedia", "main"}, {"TransiEnt", "master"}, {"VehicleInterfaces", "master"}, - {"URDFModelica", "master"} + {"URDFModelica", "main"} } loop if not installPackage(stringTypeName(l[1]), l[2]) then print(l[1] + " " + l[2] + getErrorString() + "\n");