Skip to content

[CI] Renew workflows (backport #25)#38

Merged
christophfroehlich merged 2 commits intohumblefrom
mergify/bp/humble/pr-25
Feb 17, 2024
Merged

[CI] Renew workflows (backport #25)#38
christophfroehlich merged 2 commits intohumblefrom
mergify/bp/humble/pr-25

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 14, 2024

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

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

You are currently cherry-picking commit bed7a1b.
  (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/reviewer-lottery.yml
	modified:   .github/workflows/ci-coverage-build.yml
	modified:   .github/workflows/ci-ros-lint.yml
	modified:   .github/workflows/humble-abi-compatibility.yml
	deleted:    .github/workflows/humble-binary-build-main.yml
	deleted:    .github/workflows/humble-binary-build-testing.yml
	new file:   .github/workflows/humble-binary-build.yml
	new file:   .github/workflows/humble-debian-build.yml
	new file:   .github/workflows/humble-rhel-semi-binary-build.yml
	deleted:    .github/workflows/humble-semi-binary-build-main.yml
	deleted:    .github/workflows/humble-semi-binary-build-testing.yml
	new file:   .github/workflows/humble-semi-binary-build.yml
	modified:   .github/workflows/humble-source-build.yml
	new file:   .github/workflows/reviewer_lottery.yml
	modified:   .github/workflows/rolling-abi-compatibility.yml
	deleted:    .github/workflows/rolling-binary-build-main.yml
	deleted:    .github/workflows/rolling-binary-build-testing.yml
	new file:   .github/workflows/rolling-binary-build.yml
	new file:   .github/workflows/rolling-debian-build.yml
	new file:   .github/workflows/rolling-rhel-semi-binary-build.yml
	deleted:    .github/workflows/rolling-semi-binary-build-main.yml
	deleted:    .github/workflows/rolling-semi-binary-build-testing.yml
	new file:   .github/workflows/rolling-semi-binary-build.yml
	modified:   .github/workflows/rolling-source-build.yml
	modified:   README.md
	new file:   kinematics_interface-not-released.iron.repos
	modified:   kinematics_interface.humble.repos
	new file:   kinematics_interface.iron.repos
	modified:   kinematics_interface.rolling.repos

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/workflows/humble-rhel-binary-build.yml
	deleted by them: .github/workflows/reusable-industrial-ci-with-cache.yml
	deleted by them: .github/workflows/reusable-ros-tooling-source-build.yml
	deleted by them: .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

* Use matrix strategy for main+testing and fix some issues

* Add iron workflows

* Fix newline at end of file

* Compile ros2_control_test_assets in not-binary builds

* Use correct version of ros2_control

* Update README

* Update lint job

* Source underlay for RHEL builds

* Fix default branch for scheduled workflows

* Fix branch for humble workflows

* Add reviewer lottery

* Use reusable workflows from ros2_control_ci and cleanup

* Update readme

* Update readme

(cherry picked from commit bed7a1b)

# Conflicts:
#	.github/workflows/humble-rhel-binary-build.yml
#	.github/workflows/reusable-industrial-ci-with-cache.yml
#	.github/workflows/reusable-ros-tooling-source-build.yml
#	.github/workflows/rolling-rhel-binary-build.yml
@mergify mergify bot added the conflicts label Feb 14, 2024
@mergify mergify bot mentioned this pull request Feb 14, 2024
@christophfroehlich christophfroehlich merged commit eeb394d into humble Feb 17, 2024
@mergify mergify bot deleted the mergify/bp/humble/pr-25 branch February 17, 2024 14:22
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.

1 participant