Skip to content

Sync from NVlabs/alpasim main (PR #107, #114)#7

Merged
hakuturu583 merged 3 commits into
mainfrom
feature/sync-origin-main
Jul 7, 2026
Merged

Sync from NVlabs/alpasim main (PR #107, #114)#7
hakuturu583 merged 3 commits into
mainfrom
feature/sync-origin-main

Conversation

@hakuturu583

Copy link
Copy Markdown
Collaborator

Summary

  • Merge origin/main (NVlabs/alpasim) into tier4/main to pick up the two upstream GitLab-sync PRs that landed on NVlabs but not yet on the tier4 fork.
  • Merge only — no additional edits on this branch.

Upstream commits picked up

Merge shape

Merge commit reconciling tier4/main (which has our locally-owned commits, incl. PR-6 route waypoints) with origin/main (which has the two GitLab syncs). No manual conflict resolution was required — both sides applied cleanly.

Test plan

  • uv run pytest src/driver (excluding heavy VaVAM service_flow) — 49/49 pass after merge.
  • CI on this PR (full test suite + pre-commit across the merged tree).
  • Spot-check that the tier4-only changes (per-actor control mode, LiDAR receiver work, route waypoints) are still intact after merge.

🤖 Generated with Claude Code

maximilianigl and others added 3 commits June 16, 2026 07:03
## Summary
- Sync latest changes from internal GitLab repository
- Last synced commit: `aab9c61aa` - eval: fall back to last response on
sub-control-step video frames
- Includes 1 commit(s) from GitLab

## Excluded from sync
- `plugins/internal/` - Internal-only plugin and CI/CD scripts
- `.gitlab-ci.yml` - GitLab-specific CI configuration

## Test plan
- [x] Script completed cherry-pick and created a single squashed commit
- [ ] Verify CI passes on GitHub
- [ ] Review changes in PR
- [ ] Merge to main

---------

Co-authored-by: Yuxiao Chen <yuxiaoc@nvidia.com>
## Summary
- Sync latest changes from internal GitLab repository
- Last synced commit: `a0492ae685aa68554757b85629a1f0ecbd88169d` -
Ignore local iad-slurm agent skill
- Includes 7 commit(s) from GitLab

## Excluded from sync
- `plugins/internal/` - Internal-only plugin and CI/CD scripts
- `.gitlab-ci.yml` - GitLab-specific CI configuration

## Test plan
- [x] Script completed cherry-pick and created a single squashed commit
- [x] Verify CI passes on GitHub
- [x] Review changes in PR
- [ ] Merge to main

Co-authored-by: Ellie Tanimura <etanimura@nvidia.com>
Co-authored-by: Maximilian Igl <migl@nvidia.com>
Co-authored-by: Michael Watson <mwatson@nvidia.com>
@hakuturu583
hakuturu583 merged commit c463a2d into main Jul 7, 2026
1 check passed
@hakuturu583
hakuturu583 deleted the feature/sync-origin-main branch July 7, 2026 07:06
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