Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump used Modelica language version to 3.6 #4208

Merged
merged 7 commits into from
Jan 9, 2024

Conversation

henrikt-ma
Copy link
Contributor

Fixes #4175.

Things not covered:

I'm not convinced it is a good idea to include a statement about some parts of the language being stuck at version 3.4; it would become a real mess to sort out when to reference the version 3.4 documentation and when to reference the 3.6 documentation.

Considering that there is https://specification.modelica.org/maint/3.6/modelica-concrete-syntax.html#grammar, I wonder if this would be a good time to remove the duplication in ModelicaReference?

henrikt-ma added a commit to henrikt-ma/ModelicaStandardLibrary that referenced this pull request Oct 18, 2023
This reverts commit c015bfc.

Bumping language version is now made the separate PR modelica#4208.
Detected by html_documentation_checks.
Modelica/Blocks/Noise.mo Outdated Show resolved Hide resolved
@beutlich beutlich added the requires Modelica 3.6 Issue that requires Modelica Language Specification 3.6 label Nov 21, 2023
@henrikt-ma henrikt-ma added this to the MSL4.1.0 milestone Dec 12, 2023
@henrikt-ma
Copy link
Contributor Author

It would be really good to get this merged before we tag on the 12th, since only small fixes are supposed to go into the release branch after that point. However, I don't understand the CI failure, and don't know what to do about it. To start with, I'll try pushing an empty commit…

@henrikt-ma
Copy link
Contributor Author

@casella, the empty commit did the trick, so this should be ready for a second approval and merging from your side.

Copy link
Contributor

@casella casella left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@casella casella merged commit 18320a6 into modelica:master Jan 9, 2024
2 checks passed
@henrikt-ma henrikt-ma deleted the bump-version-to-3_6 branch January 10, 2024 08:33
@beutlich beutlich removed the request for review from MartinOtter January 10, 2024 19:08
@beutlich beutlich added the documentation Issue addresses the documentation label Jan 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Issue addresses the documentation requires Modelica 3.6 Issue that requires Modelica Language Specification 3.6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Which Modelica Language version for MSL 4.1.0?
4 participants