Skip to content

Revert "Fix Ci from key signing (#5220)" (backport #5237)#5241

Merged
SteveMacenski merged 2 commits intokiltedfrom
mergify/bp/kilted/pr-5237
Jun 5, 2025
Merged

Revert "Fix Ci from key signing (#5220)" (backport #5237)#5241
SteveMacenski merged 2 commits intokiltedfrom
mergify/bp/kilted/pr-5237

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 5, 2025

Basic Info

Info Please fill out this column
Ticket(s) this addresses #5236
Primary OS tested on Ubuntu
Robotic platform tested on None
Does this PR contain AI generated software? No

Description of contribution in a few bullet points

This reverts the changes to the Dockerfile done in 1345c22.

Description of documentation updates required from your changes

None

Description of how this change was tested

None

For Maintainers:

  • Check that any new parameters added are updated in docs.nav2.org
  • Check that any significant change is added to the migration guide
  • Check that any new features OR changes to existing behaviors are reflected in the tuning guide
  • Check that any new functions have Doxygen added
  • Check that any new features have test coverage
  • Check that any new plugins is added to the plugins page
  • If BT Node, Additionally: add to BT's XML index of nodes for groot, BT package's readme table, and BT library lists
This is an automatic backport of pull request #5237 done by [Mergify](https://mergify.com).

@Nils-ChristianIseke @mergify
Revert "Fix Ci from key signing (#5220)" (#5237)
1f03126 
* Revert "Fix Ci from key signing (#5220)"

This reverts the changes to the Dockerfile done in 1345c22.

Signed-off-by: Nils-Christian Iseke <nilsmailiseke@gmail.com>

* Update Cache Version

Signed-off-by: Nils-Christian Iseke <nilsmailiseke@gmail.com>

---------

Signed-off-by: Nils-Christian Iseke <nilsmailiseke@gmail.com>
(cherry picked from commit 7f561b0)

# Conflicts:
#	.circleci/config.yml
@mergify mergify bot added the conflicts label Jun 5, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 5, 2025

Cherry-pick of 7f561b0 has failed:

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

You are currently cherry-picking commit 7f561b0f.
  (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:   Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .circleci/config.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
Copy link
Contributor Author

mergify bot commented Jun 5, 2025

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @kilted, but it must be in main
to have these changes reflected into new distributions.

@SteveMacenski
Update config.yml
062fc91 
Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
@SteveMacenski SteveMacenski merged commit 701f0c9 into kilted Jun 5, 2025
7 of 10 checks passed
@SteveMacenski SteveMacenski deleted the mergify/bp/kilted/pr-5237 branch June 5, 2025 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SteveMacenski @Nils-ChristianIseke