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

Change version to a Development Tag #21

Merged
merged 4 commits into from
Sep 21, 2023

Conversation

Deleh
Copy link

@Deleh Deleh commented Sep 18, 2023

ref https://github.com/4am-robotics/orga/issues/4739

This prevents the New release available! popup and since we're using already a "custom" version it fits better than the default version tag.

@Deleh
Copy link
Author

Deleh commented Sep 18, 2023

@fmessmer An alternative to this would be to replace the hardcoded URL with the release tags of our repos:

xhr.open("GET", "https://api.github.com/repos/flexbe/flexbe_app/tags", true);

We would then need to update the package.json for every new tag.

Copy link

@benmaidel benmaidel left a comment

Choose a reason for hiding this comment

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

When we sync our fork with the latest release from flexbe also the package.json should be synced and thus the version tag should match to the latests available release. So there should not be any more warnings about a newer version. If flexbe released a new version it is valid to have a warning on the GUI even if we are using our own fork. So we always know if it would make sense to check if a new sync should be done.

In my option we should merge the package.json instead of adding a version tag that is not existing.

@Deleh
Copy link
Author

Deleh commented Sep 19, 2023

When we sync our fork with the latest release from flexbe also the package.json should be synced and thus the version tag should match to the latests available release. So there should not be any more warnings about a newer version. If flexbe released a new version it is valid to have a warning on the GUI even if we are using our own fork. So we always know if it would make sense to check if a new sync should be done.

In my option we should merge the package.json instead of adding a version tag that is not existing.

This would be the optimal solution but I don't think this is easily possible. We are using the ROS 1 version of FlexBE where the last package.json update was commited 3 years ago to version 2.3.0. Current development seems to happen on the ros2-devel branch. The latest releases are also based on the ROS 2 branch, so our ROS 1 FlexBE app is comparing it's release version against the ROS 2 release.. (could you please verify this?)

If I saw this correctly we could either:

  1. Keep the warning and ignore it
  2. Cherry-pick the ros2-devel commit for package.json
  3. Update to a non-existing tag as currently in the PR
  4. Adjust the hard-coded URL

I'd go with 1, 3 or 4.

@HannesBachter
Copy link
Member

I get the following error when changing the package.json:

[ERROR] [1695224602.781148]: /behavior_launcher(_SubscriberImpl._invoke_callback): bad callback: <bound method BehaviorLauncher._version_callback of <flexbe_widget.behavior_launcher.BehaviorLauncher object at 0x7f842a6a8a60>>
Traceback (most recent call last):
  File "/opt/ros/noetic/lib/python3/dist-packages/rospy/topics.py", line 750, in _invoke_callback
    cb(msg)
  File "/u/kessel/git/mojin_ws/src/flexbe_behavior_engine/flexbe_widget/src/flexbe_widget/behavior_launcher.py", line 122, in _version_callback
    vui = self._parse_version(msg.data)
  File "/u/kessel/git/mojin_ws/src/flexbe_behavior_engine/flexbe_widget/src/flexbe_widget/behavior_launcher.py", line 133, in _parse_version
    result += int(n) * offset
ValueError: invalid literal for int() with base 10: '4am-dev'

@Deleh
Copy link
Author

Deleh commented Sep 20, 2023

I get the following error when changing the package.json:

[ERROR] [1695224602.781148]: /behavior_launcher(_SubscriberImpl._invoke_callback): bad callback: <bound method BehaviorLauncher._version_callback of <flexbe_widget.behavior_launcher.BehaviorLauncher object at 0x7f842a6a8a60>>
Traceback (most recent call last):
  File "/opt/ros/noetic/lib/python3/dist-packages/rospy/topics.py", line 750, in _invoke_callback
    cb(msg)
  File "/u/kessel/git/mojin_ws/src/flexbe_behavior_engine/flexbe_widget/src/flexbe_widget/behavior_launcher.py", line 122, in _version_callback
    vui = self._parse_version(msg.data)
  File "/u/kessel/git/mojin_ws/src/flexbe_behavior_engine/flexbe_widget/src/flexbe_widget/behavior_launcher.py", line 133, in _parse_version
    result += int(n) * offset
ValueError: invalid literal for int() with base 10: '4am-dev'

Ah correct, I've just tested it with the --offline flag, not flexbe_full.launch.. I'll adjust the URL for now, this is probably the cleanest solution.

Copy link
Member

@fmessmer fmessmer left a comment

Choose a reason for hiding this comment

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

  • I guess comparing to mojin-robotics/flexbe_app makes sense
  • I synced the versions of package.xml and package.json
  • I will push a tag for 2.4.0 to our fork

@fmessmer fmessmer merged commit 47f3fef into mojin-robotics:mojin-devel Sep 21, 2023
2 checks passed
@fmessmer
Copy link
Member

I used catkin_prepare_release to create a new tag....it had to be 2.4.2...and I also had to remove the tags 3.*.* because it was still comparing against those higher version tags...

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