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

iron: upstream package updates #4

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

jimmy-mcelwain
Copy link
Collaborator

Updates packages to pull from newer versions for iron

@gavanderhoorn
Copy link
Collaborator

Thanks for the PR.

Could you please rebase on iron_update_20240327? Your PR contains a couple of changes that would already be part of #3 and the diff is a bit confusing like this.

@gavanderhoorn
Copy link
Collaborator

I'm especially confused about 1aa6c57.

@jimmy-mcelwain
Copy link
Collaborator Author

Alright, I rebased onto iron_update_20240327. Hopefully that makes it cleaner.

target_ws_pkgs.ignore Outdated Show resolved Hide resolved
target_ws_pkgs.ignore Outdated Show resolved Hide resolved
target_ws_pkgs.ignore Outdated Show resolved Hide resolved
target_ws_pkgs.repos Outdated Show resolved Hide resolved
target_ws_pkgs.repos Outdated Show resolved Hide resolved
target_ws_pkgs.repos Outdated Show resolved Hide resolved
target_ws_pkgs.repos Outdated Show resolved Hide resolved
target_ws_pkgs.repos Outdated Show resolved Hide resolved
@gavanderhoorn
Copy link
Collaborator

Thanks @jimmy-mcelwain.

I've squashed your commits (and a single fixup from my side).

@gavanderhoorn
Copy link
Collaborator

Could you please let me know which upstream Iron release you took these package versions from?

Then we can update the commit comment (on 0ec37d6) and merge this.

@jimmy-mcelwain
Copy link
Collaborator Author

I misunderstood, I didn't take the versions from any single release of iron. In many cases I just pulled the latest release for iron from each package individually. I can update it to match a single released version (I will look at 20240423), but to do so I may have to also rebase some of our forked branches onto newer upstream versions, e.g. our fork of ament_cmake is based on 2.0.4 whereas iron release 20240423 targets uses 2.0.5.

Also, the micro-ros releases don't appear to target specific releases/commits when pulling packages, it just pulls the newest version from each iron branch if I am reading the .repos file correctly. So I may just target the latest released version for each repo that they target if that seems reasonable.

Sorry for the confusion

@gavanderhoorn
Copy link
Collaborator

First: lets not make things more complex than they already are. I suggest we keep the list of pkgs you already identified, including the versions in this PR.

Having written that: we loosely follow calendar versioning here, and the fact upstream tags their .repos files with something like that should make things easier to keep in-sync. Rationale: (expected) benefits wrt compatibility between (micro)ROS 2 and MotoROS2.

We can't completely limit ourselves to upstream releases as we sometimes need additional (unreleased) fixes.

For future updates we'll want to look at / stick to upstream release tags. For now we'll keep your PR as-is.

@gavanderhoorn
Copy link
Collaborator

I suggest we update the commit comment to instead mention the date at which you checked upstream.

@gavanderhoorn
Copy link
Collaborator

oh, and to clarify:

Also, the micro-ros releases don't appear to target specific releases/commits when pulling packages, it just pulls the newest version from each iron branch if I am reading the .repos file correctly. So I may just target the latest released version for each repo that they target if that seems reasonable.

When I write upstream, I don't necessarily mean micro-ROS. Technically we use micro-ROS, but quite a few packages come from 'regular' ROS 2.

I should've clarified.

@jimmy-mcelwain
Copy link
Collaborator Author

Okay. I last did a complete check of the upstream branches yesterday, so I marked it as such through the commit message and pushed it back up.

@gavanderhoorn
Copy link
Collaborator

Test build: here.

Seems to build. Thanks @jimmy-mcelwain 👍

@gavanderhoorn gavanderhoorn merged commit 370ee73 into iron_update_20240327 Jul 9, 2024
@gavanderhoorn gavanderhoorn deleted the iron_upstream_updates branch July 9, 2024 13:48
@gavanderhoorn gavanderhoorn changed the title Upstream package updates iron: upstream package updates Jul 11, 2024
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.

2 participants