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

Update and fix CI setup (backport #752) #778

Closed
wants to merge 22 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 17, 2022

This is an automatic backport of pull request #752 done by Mergify.
Cherry-pick of dabe19e has failed:

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

You are currently cherry-picking commit dabe19e.
  (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/galactic-rhel-binary-build.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
	modified:   .github/workflows/lint.yml
	new file:   ros2_control-not-released.humble.repos
	new file:   ros2_control.humble.repos

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	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-abi-compatibility.yml
	added by them:   .github/workflows/humble-source-build.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
	added by them:   .github/workflows/rolling-binary-build-testing.yml
	deleted by us:   .github/workflows/rolling-rhel-binary-build.yml
	added by them:   .github/workflows/rolling-semi-binary-build-main.yml
	added by them:   .github/workflows/rolling-semi-binary-build-testing.yml
	deleted by us:   .github/workflows/rolling-source-build.yml
	both modified:   .github/workflows/source.yml
	both modified:   README.md
	both modified:   controller_manager_msgs/package.xml

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

* Add names to ABI compatibility workflows.
* Don't use source build on the old distros.
* Disable rhel build on PRs since it will failanyway.
* We need common linters in packages that generate messages since those auto automatically used.
* remove disabling of tests.

(cherry picked from commit dabe19e)

# Conflicts:
#	.github/workflows/foxy-abi-compatibility.yml
#	.github/workflows/foxy-binary-build-main.yml
#	.github/workflows/foxy-semi-binary-build-main.yml
#	.github/workflows/galactic-abi-compatibility.yml
#	.github/workflows/galactic-binary-build-main.yml
#	.github/workflows/galactic-semi-binary-build-main.yml
#	.github/workflows/humble-abi-compatibility.yml
#	.github/workflows/humble-source-build.yml
#	.github/workflows/reusable-industrial-ci-with-cache.yml
#	.github/workflows/reusable-ros-tooling-source-build.yml
#	.github/workflows/rolling-abi-compatibility.yml
#	.github/workflows/rolling-binary-build-main.yml
#	.github/workflows/rolling-binary-build-testing.yml
#	.github/workflows/rolling-rhel-binary-build.yml
#	.github/workflows/rolling-semi-binary-build-main.yml
#	.github/workflows/rolling-semi-binary-build-testing.yml
#	.github/workflows/rolling-source-build.yml
#	.github/workflows/source.yml
#	README.md
#	controller_manager_msgs/package.xml
@mergify mergify bot added the conflicts label Jul 17, 2022
@mergify mergify bot mentioned this pull request Jul 17, 2022
@bmagyar bmagyar closed this Jan 6, 2023
@mergify mergify bot deleted the mergify/bp/galactic/pr-752 branch January 6, 2023 11:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants