Adjust CI configuration to ros2_control repository. (backport #408) #412
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* Remove old CI setup. * Adding adjusted CI configurationt to ros2_control repository. * Fixup line for private repositories. * Run format only on PR. * Adjust repos files. (cherry picked from commit 4d3404f) # Conflicts: # .github/workflows/format.yml # .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-source-build.yml # .github/workflows/lint.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-rhel-binary-build.yml # .github/workflows/rolling-semi-binary-build-main.yml # .github/workflows/rolling-source-build.yml # .pre-commit-config.yaml # README.md # ros2_controllers-not-released.foxy.repos # ros2_controllers-not-released.galactic.repos # ros2_controllers-not-released.rolling.repos # ros2_controllers.rolling.repos
|
This pull request is in conflict. Could you fix it @mergify[bot]? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #408 done by Mergify.
Cherry-pick of 4d3404f has failed:
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com