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

[CI] debian + RHEL updates (backport #985) #1017

Merged
merged 2 commits into from
Feb 17, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 5, 2024

This is an automatic backport of pull request #985 done by Mergify.
Cherry-pick of 0bcb77b has failed:

On branch mergify/bp/iron/pr-985
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 0bcb77b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .github/workflows/humble-debian-build.yml
	new file:   .github/workflows/iron-debian-build.yml
	modified:   .github/workflows/iron-rhel-binary-build.yml
	new file:   .github/workflows/rolling-debian-build.yml
	modified:   .github/workflows/rolling-rhel-binary-build.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/humble-rhel-binary-build.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 0bcb77b)

# Conflicts:
#	.github/workflows/humble-rhel-binary-build.yml
@christophfroehlich
Copy link
Contributor

@bmagyar you dropped the humble workflow files with #820 now causing this conflict. I think it can be merged as it is, let's add them to avoid future merge conflicts?

@bmagyar
Copy link
Member

bmagyar commented Feb 15, 2024

I see, let's do that

@bmagyar bmagyar merged commit 3289c0b into iron Feb 17, 2024
13 of 15 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-985 branch February 17, 2024 20:13
henrygerardmoore pushed a commit to henrygerardmoore/ros2_controllers that referenced this pull request Jul 19, 2024
* Do not explode with empty tag
* Update tests to allow empty URDF parameter to hardware interface
* Test checks that empty parameter tags work and actually checks the parsed urdf.

---------

Co-authored-by: Bence Magyar <[email protected]>
Co-authored-by: Dr. Denis <[email protected]>
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