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] Specify runner/container images and codecov for joint_limits (backport #1504) #1519

Merged
merged 1 commit into from
Apr 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2024

Necessary changes to make ros-controls/ros2_control_ci#53 work for noble.


This is an automatic backport of pull request #1504 done by Mergify.

@mergify mergify bot added the conflicts label Apr 29, 2024
Copy link
Contributor Author

mergify bot commented Apr 29, 2024

Cherry-pick of db00041 has failed:

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

You are currently cherry-picking commit db00041.
  (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:
	modified:   .github/workflows/humble-source-build.yml
	modified:   .github/workflows/iron-source-build.yml
	modified:   .github/workflows/rolling-coverage-build.yml
	modified:   .github/workflows/rolling-pre-commit.yml
	modified:   .github/workflows/rolling-source-build.yml
	modified:   codecov.yml
	modified:   ros2controlcli/ros2controlcli/api/__init__.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ros2controlcli/ros2controlcli/verb/load_controller.py

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

)

* Specify runner/container images

* Add joint_limits to coverage

* Satisfy flake8 on noble
@christophfroehlich christophfroehlich force-pushed the mergify/bp/humble/pr-1504 branch from 721b8c7 to 20e94f7 Compare April 29, 2024 19:18
@christophfroehlich christophfroehlich merged commit 7894371 into humble Apr 29, 2024
9 of 11 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1504 branch April 29, 2024 19:49
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