Skip to content

Conversation

@adeas31
Copy link
Member

@adeas31 adeas31 commented Jun 14, 2021

No description provided.

@adeas31 adeas31 requested review from adrpo and sjoelund June 14, 2021 14:27
Copy link
Member

@sjoelund sjoelund left a comment

Choose a reason for hiding this comment

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

Are we really going to ship 2 copies of PowerSystems? Latest release should be fine, no?

Copy link
Member

@sjoelund sjoelund left a comment

Choose a reason for hiding this comment

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

Makefile.libs is automatically generated from repos.json. Probably need to change the source or the changes disappear

@casella
Copy link

casella commented Jun 14, 2021

Are we really going to ship 2 copies of PowerSystems? Latest release should be fine, no?

I guess 1.0.0 should be fine. 0.6.0 had some issues that were fixed, it probably doesn't work well in OpenModelica anyway.

@casella
Copy link

casella commented Jun 14, 2021

@rfranke, what do you think?

@adeas31
Copy link
Member Author

adeas31 commented Jun 14, 2021

Are we really going to ship 2 copies of PowerSystems? Latest release should be fine, no?

I guess 1.0.0 should be fine. 0.6.0 had some issues that were fixed, it probably doesn't work well in OpenModelica anyway.

1.0.0 tag or the latest (whatever in the master).

@adeas31
Copy link
Member Author

adeas31 commented Jun 14, 2021

Makefile.libs is automatically generated from repos.json. Probably need to change the source or the changes disappear

I thought the same but then Makefile.libs is in the repo.

@adeas31 adeas31 requested a review from sjoelund June 14, 2021 15:33
@sjoelund
Copy link
Member

Yes, it's in the repo because we don't want to run the script to fetch all the information from GitHub on every build of OM. This way every system gets the same versions of the libraries as well.

@rfranke
Copy link
Member

rfranke commented Jun 21, 2021

As discussed today, please use the master branch of PowerSystems.

@adeas31
Copy link
Member Author

adeas31 commented Jun 22, 2021

@adrpo and @sjoelund time to merge this.

@sjoelund
Copy link
Member

There are conflicts :)

@adeas31
Copy link
Member Author

adeas31 commented Jun 22, 2021

It shows me "This branch has no conflicts with the base branch. Merging can be performed automatically."

@adeas31
Copy link
Member Author

adeas31 commented Jun 22, 2021

Anyway I merged in origin/master. We can now squash and merge.

@sjoelund
Copy link
Member

Still no :)

@sjoelund sjoelund merged commit 4d883a2 into OpenModelica:master Jun 22, 2021
@sjoelund
Copy link
Member

Now I could...

@adeas31 adeas31 deleted the core-libs branch June 22, 2021 10:45
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.

4 participants