Skip to content

Fix: Unblock v8.10 CI — .gitattributes trailing newlines + lab_sim skip-list rename#745

Merged
JWhitleyWork merged 2 commits into
v8.10from
fix/gitattributes-trailing-newline-v8.10
Jun 30, 2026
Merged

Fix: Unblock v8.10 CI — .gitattributes trailing newlines + lab_sim skip-list rename#745
JWhitleyWork merged 2 commits into
v8.10from
fix/gitattributes-trailing-newline-v8.10

Conversation

@fdavulcu

@fdavulcu fdavulcu commented Jun 26, 2026

Copy link
Copy Markdown

end-of-file-fixer (pre-commit, which CI runs with --all-files) fails on 9 git-lfs-generated .gitattributes files that lack a trailing newline. git-lfs writes these without a final newline when it tracks an asset directory, and the hook flags them across the whole tree — so it blocks every PR opened against v8.10 (#742, #743, and the unrelated #464 all fail on the same files).

This adds the missing trailing newline to the 9 files. The only change per file is the final newline; no rule or content change.

Also folds in the lab_sim integration-test fix (supersedes #750): moveit_pro renamed the visualization objective to Marker Visualization Example (commit 000dfb67b5), so the stale skip_objectives entry stopped matching and the objective ran in headless CI, where its GetTextFromUser step has no /request_text_from_prompts server and failed. Correcting the name re-skips it.

Bundled because the two gates are mutually blocking on v8.10: pre-commit and the integration test each fail on the base branch, so neither fix could merge without the other.

Unblocks the pre-commit end-of-file-fixer hook, which CI runs with --all-files and which fails on git-lfs-generated .gitattributes that lack a final newline.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@fdavulcu fdavulcu added this to the 8.10.8 milestone Jun 26, 2026
@coderabbitai

coderabbitai Bot commented Jun 26, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ce6760d2-5b6b-4e81-95c1-aaf7697a9979

📥 Commits

Reviewing files that changed from the base of the PR and between 22d8415 and 92ec2b6.

📒 Files selected for processing (1)
  • src/lab_sim/test/objectives_integration_test.py

📝 Walkthrough

Summary by CodeRabbit

  • Chores
    • Updated Git LFS asset-handling rules across multiple simulation content areas.
    • Common binary image and 3D model files (PNG/JPG/JPEG/OBJ/DAE/STL, with case variants) are now consistently managed via Git LFS and treated as non-text.
    • Improves consistency and reliability when storing and syncing large binary assets.
  • Tests
    • Updated an integration test skip list entry, swapping one skipped objective for another.

Walkthrough

Updated several .gitattributes files to route common image and 3D model extensions through Git LFS, and changed one lab simulation integration test skip entry.

Changes

Git LFS asset attributes

Layer / File(s) Summary
Asset LFS rules
src/factory_sim/objectives/.gitattributes, src/hangar_sim/{description/assets,images,maps}/.gitattributes, src/moveit_pro_franka_configs/kitchen_sim/description/mujoco/assets/kitchen_assets/textures/.gitattributes, src/moveit_pro_kinova_configs/{kinova_sim/description/mujoco/assets,space_satellite_sim/description/mujoco/assets,space_satellite_sim_camera_cal/description/mujoco/assets}/.gitattributes, src/moveit_pro_ur_configs/mock_sim/meshes/.gitattributes
These .gitattributes entries set filter=lfs, diff=lfs, merge=lfs, and -text for common PNG/JPG/JPEG/OBJ/DAE/STL variants.

Lab simulation objective skip update

Layer / File(s) Summary
Skipped objective name
src/lab_sim/test/objectives_integration_test.py
The skip_objectives set replaces Interactive Marker Visualization with Marker Visualization Example.

Suggested reviewers

  • JWhitleyWork
🚥 Pre-merge checks | ✅ 4
✅ Passed checks (4 passed)
Check name Status Explanation
Description check ✅ Passed The description matches the changeset: it explains the .gitattributes newline fixes and the updated integration-test skip entry.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Human Review Check ✅ Passed Only nine .gitattributes newline fixes plus one lab_sim test skip-list swap; no API, core behavior, infra, or deployment changes.

Comment @coderabbitai help to get the list of available commands.

@fdavulcu fdavulcu marked this pull request as ready for review June 26, 2026 07:42
@fdavulcu fdavulcu enabled auto-merge June 26, 2026 07:43

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 5

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/factory_sim/objectives/.gitattributes`:
- Line 1: The LFS rule in the gitattributes entry uses brace expansion syntax,
which Git does not support, so the asset files are not being matched. Replace
the single brace-based pattern with explicit Git-compatible patterns for each
file type in this attributes file, covering both lowercase and uppercase
variants so the LFS filters apply correctly to the intended assets.

In `@src/hangar_sim/description/assets/.gitattributes`:
- Line 1: The asset LFS rule in the .gitattributes entry uses brace expansion,
which Git does not support, so it will not match the intended files. Replace the
single glob in this .gitattributes rule with explicit Git patterns for each
extension, covering both lowercase and uppercase variants, and keep the same
filter=lfs, diff=lfs, merge=lfs, and -text attributes. Use the existing
.gitattributes asset rule as the target for the change.

In `@src/hangar_sim/images/.gitattributes`:
- Line 1: The .gitattributes rule currently uses brace expansion in the asset
pattern, which Git does not support, so the LFS filter will not match these
files. Update the rule in the hangar_sim images attributes entry to use explicit
Git patterns for each extension instead of the combined brace form. Keep the
existing LFS settings (filter, diff, merge, -text) and expand them into separate
patterns covering the png/jpg/jpeg and obj/dae/stl variants, including uppercase
forms as needed.

In
`@src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/.gitattributes`:
- Line 1: The asset tracking rule in the .gitattributes file uses unsupported
brace expansion, so it will not match the intended image and mesh files. Replace
the single glob in this attributes entry with explicit Git patterns for each
extension, keeping the same LFS settings, and ensure the rule still applies to
both lowercase and uppercase variants of the asset types.

In `@src/moveit_pro_ur_configs/mock_sim/meshes/.gitattributes`:
- Line 1: The Git LFS rule in the mock_sim meshes .gitattributes file uses brace
expansion syntax that Git attributes do not support, so the pattern never
matches the intended asset files. Replace the single brace-based rule with
explicit Git attribute patterns for each extension, covering both lowercase and
uppercase variants, so the LFS filter applies correctly to the mesh and image
files.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 2c0ea60a-14d7-4c3f-837a-dfd8c9d5bc65

📥 Commits

Reviewing files that changed from the base of the PR and between 18edcb7 and 22d8415.

📒 Files selected for processing (9)
  • src/factory_sim/objectives/.gitattributes
  • src/hangar_sim/description/assets/.gitattributes
  • src/hangar_sim/images/.gitattributes
  • src/hangar_sim/maps/.gitattributes
  • src/moveit_pro_franka_configs/kitchen_sim/description/mujoco/assets/kitchen_assets/textures/.gitattributes
  • src/moveit_pro_kinova_configs/kinova_sim/description/mujoco/assets/.gitattributes
  • src/moveit_pro_kinova_configs/space_satellite_sim/description/mujoco/assets/.gitattributes
  • src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/.gitattributes
  • src/moveit_pro_ur_configs/mock_sim/meshes/.gitattributes

Comment thread src/factory_sim/objectives/.gitattributes
Comment thread src/hangar_sim/description/assets/.gitattributes
Comment thread src/hangar_sim/images/.gitattributes
Comment thread src/moveit_pro_ur_configs/mock_sim/meshes/.gitattributes
coderabbitai[bot]
coderabbitai Bot previously approved these changes Jun 26, 2026
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@fdavulcu fdavulcu changed the title Fix: Add trailing newline to git-lfs .gitattributes files (unblocks pre-commit on v8.10) Fix: Unblock v8.10 CI — .gitattributes trailing newlines + lab_sim skip-list rename Jun 30, 2026
@fdavulcu fdavulcu requested a review from L4co77 June 30, 2026 11:32
@JWhitleyWork JWhitleyWork disabled auto-merge June 30, 2026 15:13
@JWhitleyWork JWhitleyWork merged commit 6633bee into v8.10 Jun 30, 2026
10 checks passed
@JWhitleyWork JWhitleyWork deleted the fix/gitattributes-trailing-newline-v8.10 branch June 30, 2026 15:13
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.

3 participants