Skip to content

Merge Upstream to Main #633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JWhitleyWork merged 27 commits into from
May 15, 2026
Merged

Merge Upstream to Main #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8250d60
Initial commit
MikeWrock Oct 24, 2024
865257f
added required files
MikeWrock Oct 24, 2024
7ed6cc3
Template docker-compose.yaml for merging
Dec 4, 2024
4e4fb87
remove docker compose yaml
Dec 4, 2024
9b06b36
Merge pull request #4 from PickNikRobotics/remove-compose
dsobek Dec 6, 2024
493136f
Merge branch 'main' into merge-compose
MikeWrock Jan 1, 2025
aa086d6
Merge pull request #3 from PickNikRobotics/merge-compose
MikeWrock Jan 1, 2025
4ec060a
Update docker-compose.yaml
MikeWrock Jan 1, 2025
488f7e4
Add clang-format file (#12)
sjahr Jan 27, 2025
ef69e39
Fix .gitattributes file
pac48 Feb 14, 2025
22f9403
Merge pull request #16 from PickNikRobotics/pr-fix-git-attributes
EzraBrooks Feb 14, 2025
eee84be
Add src directory
sjahr Mar 5, 2025
3784913
Merge pull request #23 from PickNikRobotics/pr-add-src-dir
MikeWrock Mar 5, 2025
63041c3
Create .gitignore
sjahr Mar 7, 2025
efe21d7
Merge pull request #26 from PickNikRobotics/pr-add-git-ignore
MikeWrock Mar 10, 2025
22c3b6b
Adjust yaml lint to allow for different sequence indent options
dsobek Mar 13, 2025
c532395
Merge pull request #27 from PickNikRobotics/dsobek-patch-1
EzraBrooks Mar 17, 2025
fc683b0
Make all docker-compose services mappings
dyackzan May 8, 2025
1e60c14
Merge pull request #41 from PickNikRobotics/fix-docker-compose
shaur-k Jul 29, 2025
bc5980b
Fix caching of dependency steps in Docker build
EzraBrooks Jul 30, 2025
bf166bf
fix(docker): build kit volume mounting
shaur-k Mar 11, 2025
87a5c20
Merge pull request #42 from PickNikRobotics/grab-important-commits
shaur-k Aug 7, 2025
f2f6fe9
fix: aligning the docker files from example ws
shaur-k Sep 2, 2025
4bed4dd
Merge pull request #44 from PickNikRobotics/align-docker-files
shaur-k Sep 2, 2025
fd975dc
Update Dockerfile and docker-compose to match example_ws (#53)
JWhitleyWork Feb 13, 2026
9fa9e0f
Update main With Changes from example_ws (#54)
JWhitleyWork May 15, 2026
91fb46a
Merge remote-tracking branch 'upstream/main' into upstream-merge
JWhitleyWork May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ install/
log/
.vscode/
MUJOCO_LOG.TXT
.ccache/
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ repos:
name: "Lint Dockerfiles"
language: docker_image
types: ["dockerfile"]
entry: hadolint/hadolint:2.11.0 hadolint
entry: hadolint/hadolint:v2.14.0 hadolint

- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v4.0.0-alpha.8"
Expand Down
Loading