Merge empty ws#632
Closed
JWhitleyWork wants to merge 27 commits into
Closed
Conversation
Remove docker compose yaml
Template docker-compose.yaml for merging
Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>
Fix git attributes file
Add src directory
Create .gitignore
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.
Grab important commits
fix: aligning the docker files from example ws
JWhitleyWork
force-pushed
the
merge-empty-ws
branch
from
08d80ce to
583b193
Compare
There was a problem hiding this comment.
Pull request overview
This PR appears to aim at turning the repository into a more minimal “user workspace” by simplifying top-level documentation and trimming build/CI/lint configuration that was specific to the prior, more feature-complete example workspace.
Changes:
- Simplifies the README to position the repo as a minimal, forkable MoveIt Pro workspace.
- Trims
colcon-defaults.yaml,.gitattributes,.gitignore, and removes local pre-commit hooks. - Refactors GitHub Actions workflows, including switching the CI reusable workflow reference and adjusting inputs/secrets handling.
Reviewed changes
Copilot reviewed 5 out of 6 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| README.md | Rewords the repo purpose and removes detailed cloning/submodule guidance. |
| colcon-defaults.yaml | Removes package override/skip lists to simplify colcon defaults. |
| .pre-commit-config.yaml | Updates hadolint image tag and removes local validation hooks. |
| .gitignore | Removes editor/log ignores and adds .ccache/. |
| .github/workflows/format.yaml | Changes action versions used for running pre-commit in CI. |
| .github/workflows/ci.yaml | Changes the reusable workflow reference, input wiring, secrets handling, and checkout action version. |
| .gitattributes | Removes Git LFS rules for specific (now-removed) YAML paths. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+3
to
+7
| This is a minimal user workspace that can be used to build customized MoveIt Pro workspaces. | ||
|
|
||
| ## Cloning | ||
| You may fork this repository and add the MoveIt Pro configurations and ROS 2 packages of your choosing to the `src` folder. | ||
|
|
||
| This repository uses git submodules. Clone with: | ||
| ```bash | ||
| git clone --recurse-submodules <repo-url> | ||
| ``` | ||
|
|
||
| If you already cloned without submodules, initialize them with: | ||
| ```bash | ||
| git submodule update --recursive --init | ||
| ``` | ||
|
|
||
| Several submodules (notably `picknik_accessories`) use git LFS. Install [git-lfs](https://git-lfs.com/) first (e.g., `sudo apt install git-lfs && git lfs install`); without it the commands below fail with `git: 'lfs' is not a git command`. After updating submodules, pull LFS objects: | ||
| ```bash | ||
| git submodule foreach --recursive git lfs pull | ||
| ``` | ||
|
|
||
| ## Robot Configs | ||
|
|
||
| - `april_tag_sim` | ||
| - `dual_arm_sim` | ||
| - `factory_sim` | ||
| - `grinding_sim` | ||
| - `hangar_sim` | ||
| - `kitchen_sim` | ||
| - `lab_sim` | ||
| - `lunar_sim` | ||
| - `phoebe_sim` | ||
| - `moveit_pro_franka_configs/franka_base_config` | ||
| - `moveit_pro_kinova_configs/kinova_gen3_base_config` | ||
| - `moveit_pro_kinova_configs/kinova_gen3_site_config` | ||
| - `moveit_pro_kinova_configs/kinova_sim` | ||
| - `moveit_pro_kinova_configs/space_satellite_sim` | ||
| - `moveit_pro_kinova_configs/space_satellite_sim_camera_cal` | ||
| - `moveit_pro_ur_configs/mock_sim` | ||
| - `moveit_pro_ur_configs/multi_arm_sim` | ||
| - `moveit_pro_ur_configs/picknik_ur_base_config` | ||
| - `moveit_pro_ur_configs/picknik_ur_site_config` | ||
|
|
||
| ## Updating Submodules | ||
|
|
||
| To pull the latest commits for all submodules: | ||
| ```bash | ||
| git submodule update --remote --recursive | ||
| git submodule foreach --recursive git lfs pull | ||
| ``` | ||
| For more information, refer to the [MoveIt Pro Documentation](https://docs.picknik.ai/). |
Comment on lines
+15
to
+17
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-python@v3 | ||
| - uses: pre-commit/action@v3.0.0 |
| @@ -88,18 +88,3 @@ repos: | |||
| - "prettier@3.1.0" | |||
| - "@prettier/plugin-xml@3.3.1" | |||
| files: \.(xml)$ | |||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.