Skip to content

Don't override semver prerelease for master/main/trunk#51

Merged
AnHeuermann merged 5 commits intoOpenModelica:masterfrom
AnHeuermann:fix-missing-msl-dev
Sep 17, 2025
Merged

Don't override semver prerelease for master/main/trunk#51
AnHeuermann merged 5 commits intoOpenModelica:masterfrom
AnHeuermann:fix-missing-msl-dev

Conversation

@AnHeuermann
Copy link
Copy Markdown
Member

Issue

Should fix OpenModelica/OpenModelicaLibraryTesting#222.

Changes

  • No longer override prerelease of semver version if on master/main/trunk branch
  • Fixes missing version v4.2.0-dev from MSL from OMPackageManager
  • Adding tests for new_libentry

  - No longer override prerelease of semver version if on master/main/trunk branch
  - Fixes missing version v4.2.0-dev from MSL from OMPackageManager
  - Adding tests for `new_libentry`
@AnHeuermann AnHeuermann self-assigned this Sep 17, 2025
@AnHeuermann
Copy link
Copy Markdown
Member Author

I also need to update rawdata.json, since the Jenkins job isn't removing the file and that changes the behaviour.

@AnHeuermann AnHeuermann changed the title Don't override semver prerelease for master/main Don't override semver prerelease for master/main/trunk Sep 17, 2025
@AnHeuermann
Copy link
Copy Markdown
Member Author

I also need to update rawdata.json, since the Jenkins job isn't removing the file and that changes the behaviour.

Done in #52

@AnHeuermann AnHeuermann marked this pull request as ready for review September 17, 2025 16:43
@AnHeuermann
Copy link
Copy Markdown
Member Author

Mhh... I'm still missing something. The master version of the MSL should provide 4.2.0-dev instead of 4.2.0-master.

index.json

{
  "libs": {
    "Modelica": {
      "git": "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git",
      "versions": {
        "4.2.0-master": {
          "convertFromVersion": [
            "3.0.0",
            "3.0.1",
            "3.1.0",
            "3.2.0",
            "3.2.1",
            "3.2.2",
            "3.2.3"
          ],
          "path": "Modelica",
          "provides": [
            "4.0.0",
            "4.1.0"
          ],
          "support": "noSupport",
          "uses": {
            "Complex": "4.2.0-dev",
            "ModelicaServices": "4.2.0-dev"
          },
          "version": "4.2.0-master",
          "zipfile": "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary/archive/0f27e460c7639c3e138766572f30842142367379.zip"
        }
      }
    }
  }
}

@AnHeuermann
Copy link
Copy Markdown
Member Author

Regenerating rawdata.json did the trick. If that wouldn't take forever each time, though.

@AnHeuermann AnHeuermann enabled auto-merge (squash) September 17, 2025 17:19
@AnHeuermann AnHeuermann merged commit 0725142 into OpenModelica:master Sep 17, 2025
4 checks passed
@AnHeuermann AnHeuermann deleted the fix-missing-msl-dev branch September 17, 2025 17:24
@AnHeuermann
Copy link
Copy Markdown
Member Author

It should be

-        "4.2.0-dev": {
+        "master": {
          "convertFromVersion": [
            "3.0.0",
            "3.0.1",
            "3.1.0",
            "3.2.0",
            "3.2.1",
            "3.2.2",
            "3.2.3"
          ],
          "path": "Modelica",
          "provides": [
            "4.0.0",
            "4.1.0"
          ],
          "support": "noSupport",
          "uses": {
            "Complex": "4.2.0-dev",
            "ModelicaServices": "4.2.0-dev"
          },
          "version": "4.2.0-dev",
          "zipfile": "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary/archive/0f27e460c7639c3e138766572f30842142367379.zip"
        },

I have to fix this tomorrow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Missing Modelica 4.2.0-dev in package index when running installLibraries.mos

1 participant