Skip to content

Merge Upstream to Main#633

Merged
JWhitleyWork merged 27 commits into
mainfrom
upstream-merge
May 15, 2026
Merged

Merge Upstream to Main#633
JWhitleyWork merged 27 commits into
mainfrom
upstream-merge

Conversation

@JWhitleyWork
Copy link
Copy Markdown
Member

@JWhitleyWork JWhitleyWork commented May 15, 2026

This should allow moveit_pro_example_ws to show that it is "up-to-date" with moveit_pro_empty_ws (I hope).

MikeWrock and others added 27 commits October 24, 2024 14:52
Template docker-compose.yaml for merging
Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>
Adjust yaml lint to allow for different sequence indent options
It seems like in some version of docker-compose, the services must be
followed by an empty curly bracket `{}` to be valid syntax or
docker-compose will fail with an error message like `services must be a
mapping`.
Make all docker-compose services mappings
`log` wasn't ignored in the build context and was causing cache busts.
fix: aligning the docker files from example ws
@JWhitleyWork JWhitleyWork added this to the 9.4.0 milestone May 15, 2026
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR aligns the example workspace with upstream maintenance updates for tooling and ignored local build artifacts.

Changes:

  • Updates the Hadolint Docker image tag used by pre-commit to match the configured Hadolint revision.
  • Adds .ccache/ to ignored local artifacts.

Reviewed changes

Copilot reviewed 1 out of 2 changed files in this pull request and generated no comments.

File Description
.pre-commit-config.yaml Updates the Hadolint Docker image entry used by the Dockerfile lint hook.
.gitignore Ignores local ccache output.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@JWhitleyWork JWhitleyWork disabled auto-merge May 15, 2026 21:03
@JWhitleyWork JWhitleyWork merged commit df00cbc into main May 15, 2026
9 checks passed
@JWhitleyWork JWhitleyWork deleted the upstream-merge branch May 15, 2026 21:03
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.

9 participants