Skip to content

CI: More generically fix permission errors (backport #1215)#1235

Merged
henningkayser merged 2 commits intofoxyfrom
mergify/bp/foxy/pr-1215
May 10, 2022
Merged

CI: More generically fix permission errors (backport #1215)#1235
henningkayser merged 2 commits intofoxyfrom
mergify/bp/foxy/pr-1215

Conversation

@mergify
Copy link

@mergify mergify bot commented May 10, 2022

This is an automatic backport of pull request #1215 done by Mergify.
Cherry-pick of 806cce4 has failed:

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

You are currently cherry-picking commit 806cce470.
  (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:   .docker/ci/Dockerfile
	both modified:   .docker/source/Dockerfile

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

* CI: More generically fix permission errors

Disable git security check for any folder.
We are running a docker container on GHA. Chances are low that this gets compromised.

* Revert changes to source Dockerfile

These are inherited from ci.

(cherry picked from commit 806cce4)

# Conflicts:
#	.docker/ci/Dockerfile
#	.docker/source/Dockerfile
@mergify mergify bot added the conflicts label May 10, 2022
@codecov
Copy link

codecov bot commented May 10, 2022

Codecov Report

Merging #1235 (30d5a56) into foxy (3b257aa) will decrease coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             foxy    #1235      +/-   ##
==========================================
- Coverage   46.81%   46.79%   -0.01%     
==========================================
  Files         185      185              
  Lines       19693    19693              
==========================================
- Hits         9217     9214       -3     
- Misses      10476    10479       +3     
Impacted Files Coverage Δ
...dl_kinematics_plugin/src/kdl_kinematics_plugin.cpp 74.72% <0.00%> (-1.13%) ⬇️

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 3b257aa...30d5a56. Read the comment docs.

@henningkayser henningkayser merged commit 4f83466 into foxy May 10, 2022
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/foxy/pr-1215 branch May 10, 2022 15:29
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.

4 participants