ros2_controllers icon indicating copy to clipboard operation
ros2_controllers copied to clipboard

Adjust CI configuration to ros2_control repository. (backport #408)

Open mergify[bot] opened this issue 3 years ago • 0 comments

This is an automatic backport of pull request #408 done by Mergify. Cherry-pick of 4d3404f8bf394b2f11dd1b4fd9be4070b4bf5767 has failed:

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

You are currently cherry-picking commit 4d3404f.
  (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/README.md
	new file:   .github/workflows/ci-coverage-build.yml
	new file:   .github/workflows/foxy-binary-build-testing.yml
	new file:   .github/workflows/foxy-rhel-binary-build.yml
	new file:   .github/workflows/foxy-semi-binary-build-testing.yml
	new file:   .github/workflows/galactic-binary-build-testing.yml
	new file:   .github/workflows/galactic-rhel-binary-build.yml
	new file:   .github/workflows/galactic-semi-binary-build-testing.yml
	new file:   .github/workflows/humble-abi-compatibility.yml
	new file:   .github/workflows/humble-binary-build-main.yml
	new file:   .github/workflows/humble-binary-build-testing.yml
	new file:   .github/workflows/humble-rhel-binary-build.yml
	new file:   .github/workflows/humble-semi-binary-build-main.yml
	new file:   .github/workflows/humble-semi-binary-build-testing.yml
	new file:   .github/workflows/rolling-binary-build-testing.yml
	new file:   .github/workflows/rolling-semi-binary-build-testing.yml
	new file:   ros2_controllers-not-released.humble.repos
	new file:   ros2_controllers.humble.repos

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/format.yml
	deleted by us:   .github/workflows/foxy-abi-compatibility.yml
	added by them:   .github/workflows/foxy-binary-build-main.yml
	added by them:   .github/workflows/foxy-semi-binary-build-main.yml
	deleted by us:   .github/workflows/galactic-abi-compatibility.yml
	added by them:   .github/workflows/galactic-binary-build-main.yml
	added by them:   .github/workflows/galactic-semi-binary-build-main.yml
	added by them:   .github/workflows/humble-source-build.yml
	both modified:   .github/workflows/lint.yml
	deleted by us:   .github/workflows/reusable-industrial-ci-with-cache.yml
	deleted by us:   .github/workflows/reusable-ros-tooling-source-build.yml
	deleted by us:   .github/workflows/rolling-abi-compatibility.yml
	added by them:   .github/workflows/rolling-binary-build-main.yml
	deleted by us:   .github/workflows/rolling-rhel-binary-build.yml
	added by them:   .github/workflows/rolling-semi-binary-build-main.yml
	deleted by us:   .github/workflows/rolling-source-build.yml
	both modified:   .pre-commit-config.yaml
	both modified:   README.md
	deleted by us:   ros2_controllers-not-released.foxy.repos
	deleted by us:   ros2_controllers-not-released.galactic.repos
	deleted by us:   ros2_controllers-not-released.rolling.repos
	deleted by us:   ros2_controllers.rolling.repos

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

mergify[bot] avatar Aug 10 '22 17:08 mergify[bot]