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

[rolling] updated ros-tooling versions (backport #289) #299

Merged
merged 2 commits into from
Jun 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2022

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

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

You are currently cherry-picking commit eac6a8d.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml

no changes added to commit (use "git add" and/or "git commit -a")

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

* updated ros-tooling versions

Signed-off-by: Jan Staschulat (CR/ADA1.2) <jan.staschulat@de.bosch.com>

* reverted back to setup-ros@0.3.0

Signed-off-by: Jan Staschulat (CR/ADA1.2) <jan.staschulat@de.bosch.com>

* ros-tooling/setup-ros@0.3.1

Signed-off-by: Jan Staschulat (CR/ADA1.2) <jan.staschulat@de.bosch.com>

* updated ros-tooling/setup-ros@0.3.3

Signed-off-by: Jan Staschulat (CR/ADA1.2) <jan.staschulat@de.bosch.com>
(cherry picked from commit eac6a8d)

# Conflicts:
#	.github/workflows/ci.yml
Signed-off-by: Jan Staschulat (CR/ADA1.2) <jan.staschulat@de.bosch.com>
@codecov-commenter
Copy link

Codecov Report

Merging #299 (9fe6b0d) into foxy (b86652c) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             foxy     #299   +/-   ##
=======================================
  Coverage   60.32%   60.32%           
=======================================
  Files          14       14           
  Lines        1555     1555           
  Branches      507      507           
=======================================
  Hits          938      938           
  Misses        339      339           
  Partials      278      278           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b86652c...9fe6b0d. Read the comment docs.

@JanStaschulat JanStaschulat merged commit 5db9242 into foxy Jun 2, 2022
@JanStaschulat JanStaschulat deleted the mergify/bp/foxy/pr-289 branch June 2, 2022 11:30
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