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

release.py: skip ROS for non-stable releases #1261

Merged
merged 3 commits into from
Feb 13, 2025

Conversation

scpeters
Copy link
Contributor

Skip trying to update ROS vendor packages for prerelease or nightly releases.

Without this I get an error when trying to make a prerelease for gazebosim/gz-cmake#469:

ROS vendor packages that can be updated:
 * Github gazebo-release/gz_cmake_vendor part of ionic in ROS 2 rolling
   + Preparing a PR: 
[notice] A new release of pip is available: 24.2 -> 25.0.1
[notice] To update, run: /private/var/folders/6f/__qxt3jn4j3dxgd2grbmmvtm0000gn/T/tmpmpxnxrxf/venv/bin/python3.12 -m pip install --upgrade pip
Error running command (git -C /var/folders/6f/__qxt3jn4j3dxgd2grbmmvtm0000gn/T/tmpmpxnxrxf/gz_vendor_repo checkout -b releasepy/rolling/4.1.1~pre1).
stdout: 
stderr: fatal: 'releasepy/rolling/4.1.1~pre1' is not a valid branch name
hint: See `man git check-ref-format`
hint: Disable this message with "git config set advice.refSyntax false"

Traceback (most recent call last):
  File "/Users/scpeters/clone/release-tools/release.py", line 961, in <module>
    go(sys.argv)
  File "/Users/scpeters/clone/release-tools/release.py", line 957, in go
    process_ros_vendor_package(args)
  File "/Users/scpeters/clone/release-tools/release.py", line 815, in process_ros_vendor_package
    pr_url = create_pr_in_gz_vendor_repo(args, ros_distro)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/scpeters/clone/release-tools/release.py", line 797, in create_pr_in_gz_vendor_repo
    pr_msg = create_pr_for_vendor_package(
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/scpeters/clone/release-tools/release.py", line 754, in create_pr_for_vendor_package
    _, _ = check_call(branch_cmd, IGNORE_DRY_RUN)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/scpeters/clone/release-tools/release.py", line 504, in check_call
    raise Exception('subprocess call failed')
Exception: subprocess call failed

Skip trying to update ROS vendor packages for prerelease
or nightly releases.

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested a review from j-rivero as a code owner February 13, 2025 07:28
@j-rivero j-rivero force-pushed the scpeters/release_py_skip_ros_unless_stable branch from 41b9e1f to a8447df Compare February 13, 2025 12:14
@j-rivero
Copy link
Contributor

I've moved the logic 1aa83d8 into the process_ros_vendor_package function so we also catch other cases like the enable of bump_ros_vendor_only. Also added a check for this use case a8447df

@scpeters
Copy link
Contributor Author

thanks for improving my PR!

@scpeters scpeters merged commit 1da3adc into master Feb 13, 2025
1 check passed
@scpeters scpeters deleted the scpeters/release_py_skip_ros_unless_stable branch February 13, 2025 19:53
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