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

Upgrade to Conan 2 #58

Merged
merged 9 commits into from
Dec 13, 2024
Merged

Upgrade to Conan 2 #58

merged 9 commits into from
Dec 13, 2024

Conversation

kyllingstad
Copy link
Member

This is just #55 again. I reverted that pull request because it depends on open-simulation-platform/libcosim#753, which is not in a release yet. (More details in this comment.)

We have to choose between these two options:

  1. Make a new libcosim release before merging this, so libcosimc master can continue to use the libcosim@osp/stable package.
  2. Switch to using libcosim@osp/testing (which tracks libcosim master) in libcosimc master.

@kyllingstad kyllingstad added the enhancement New feature or request label Apr 18, 2024
@kyllingstad kyllingstad self-assigned this Apr 18, 2024
@kyllingstad
Copy link
Member Author

Aw man, master is still broken despite the fact that I reverted all my changes to it. The problem is that our dependencies have moved on and no longer support the Conan version we use in our CI setup. That makes it all the more urgent to resolve the questions above and get this merged (again).

Copy link
Member

@restenb restenb left a comment

Choose a reason for hiding this comment

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

Now that libcosim is released, guess it's time to get around to this so we can release libcosimc. I have updated versions of libcosim and doxygen, and the builds started working again.

@restenb
Copy link
Member

restenb commented Dec 12, 2024

This is just #55 again. I reverted that pull request because it depends on open-simulation-platform/libcosim#753, which is not in a release yet. (More details in this comment.)

We have to choose between these two options:

  1. Make a new libcosim release before merging this, so libcosimc master can continue to use the libcosim@osp/stable package.
  2. Switch to using libcosim@osp/testing (which tracks libcosim master) in libcosimc master.

I'm in favor of sticking to the stable release version of libcosim for libcosimc master, at least.

@kyllingstad
Copy link
Member Author

Thanks for updating the PR, @restenb!

@kyllingstad kyllingstad merged commit 4e2e093 into master Dec 13, 2024
16 checks passed
@kyllingstad kyllingstad deleted the feature/conan-2 branch December 13, 2024 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants