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] Reusable workflows from ros2_control_ci (backport #1383) #1393

Merged
merged 2 commits into from
Feb 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2024

This is an automatic backport of pull request #1383 done by Mergify.
Cherry-pick of 3a21841 has failed:

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

You are currently cherry-picking commit 3a21841.
  (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:
	renamed:    .github/workflows/humble-binary-build-testing.yml -> .github/workflows/humble-binary-build.yml
	deleted:    .github/workflows/humble-semi-binary-build-main.yml
	deleted:    .github/workflows/humble-semi-binary-build-testing.yml
	renamed:    .github/workflows/humble-binary-build-main.yml -> .github/workflows/humble-semi-binary-build.yml
	modified:   .github/workflows/humble-source-build.yml
	modified:   .github/workflows/iron-source-build.yml
	deleted:    .github/workflows/reusable-industrial-ci-with-cache.yml
	renamed:    .github/workflows/rolling-binary-build-testing.yml -> .github/workflows/rolling-binary-build.yml
	deleted:    .github/workflows/rolling-semi-binary-build-main.yml
	deleted:    .github/workflows/rolling-semi-binary-build-testing.yml
	renamed:    .github/workflows/rolling-binary-build-main.yml -> .github/workflows/rolling-semi-binary-build.yml
	modified:   .github/workflows/rolling-source-build.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/humble-debian-build.yml
	both modified:   .github/workflows/humble-rhel-binary-build.yml
	deleted by us:   .github/workflows/iron-binary-build.yml
	both modified:   .github/workflows/iron-debian-build.yml
	both modified:   .github/workflows/iron-rhel-binary-build.yml
	deleted by us:   .github/workflows/iron-semi-binary-build.yml
	deleted by them: .github/workflows/reusable-ros-tooling-source-build.yml
	both modified:   .github/workflows/rolling-debian-build.yml
	both modified:   .github/workflows/rolling-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 3a21841)

# Conflicts:
#	.github/workflows/humble-debian-build.yml
#	.github/workflows/humble-rhel-binary-build.yml
#	.github/workflows/iron-binary-build.yml
#	.github/workflows/iron-debian-build.yml
#	.github/workflows/iron-rhel-binary-build.yml
#	.github/workflows/iron-semi-binary-build.yml
#	.github/workflows/reusable-ros-tooling-source-build.yml
#	.github/workflows/rolling-debian-build.yml
#	.github/workflows/rolling-rhel-binary-build.yml
@mergify mergify bot added the conflicts label Feb 14, 2024
@bmagyar bmagyar merged commit 9260d32 into humble Feb 15, 2024
13 of 14 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-1383 branch February 15, 2024 17:14
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