Skip to content

[Humble] Changed to rostooling/setup-ros-docker:ubuntu-noble-latest for CI image.#37

Open
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-36
Open

[Humble] Changed to rostooling/setup-ros-docker:ubuntu-noble-latest for CI image.#37
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-36

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Mar 31, 2026

Backport of #36 to Humble.

…ge. (#36)

(cherry picked from commit 90b63cd)

# Conflicts:
#	.github/workflows/ci.yml
@mergify mergify bot requested a review from a team as a code owner March 31, 2026 15:12
@mergify mergify bot added the conflicts label Mar 31, 2026
@mergify mergify bot requested review from nnarain-cpr and tonybaltovski and removed request for a team March 31, 2026 15:12
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Mar 31, 2026

Cherry-pick of 90b63cd has failed:

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

You are currently cherry-picking commit 90b63cd.
  (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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

- uses: actions/checkout@v3
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
<<<<<<< HEAD
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems wrong. @tonybaltovski does merify do this intentionally? Saw it on another MR as well.

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.

2 participants