Skip to content
This repository was archived by the owner on Mar 28, 2025. It is now read-only.

Update readme and CI jobs for iron (backport #248) #259

Merged
merged 1 commit into from
Jan 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 4, 2024

This is an automatic backport of pull request #248 done by Mergify.
Cherry-pick of 074617a has failed:

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

You are currently cherry-picking commit 074617a.
  (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/ci-humble.yaml
	new file:   .github/workflows/ci-iron.yaml
	renamed:    .github/workflows/ci.yaml -> .github/workflows/ci-rolling.yaml
	modified:   README.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/dependabot.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit 074617a)

# Conflicts:
#	.github/dependabot.yml
@mergify mergify bot added the conflicts label Jan 4, 2024
@ahcorde ahcorde merged commit 7817964 into humble Jan 4, 2024
@ahcorde ahcorde deleted the mergify/bp/humble/pr-248 branch January 4, 2024 11:04
k-takeshita pushed a commit to hsr-project/gazebo_ros2_control that referenced this pull request Oct 21, 2024
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit 074617a)

Co-authored-by: Christoph Fröhlich <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants