Skip to content

Refresh vendored franka_config from upstream (merge conflicts) - #1055

Draft
sister-repos-control-app[bot] wants to merge 1 commit into
mainfrom
vendored-refresh/franka_config
Draft

sister-repos-control-app[bot] wants to merge 1 commit into
mainfrom
vendored-refresh/franka_config

Conversation

@sister-repos-control-app

Copy link
Copy Markdown

bin/vendored_dependency.py update franka_config moved src/external_dependencies/franka_config from upstream commit 494d1d474844c167d72ccd604633545c9067eea2 to 7aeeddc449edf8d62b594f9e36a81da53e7796f9 and stopped before finishing: resolve the conflict markers or UPSTREAM.yaml errors in the output below, then run bin/validate_workspace_dependencies.py --verify-upstream and build the configs that use this source.

The weekly vendored-refresh job force-pushes this branch when upstream moves again, so commit follow-up fixes to a separate branch.

Refreshed src/external_dependencies/franka_config from 494d1d474 to 7aeeddc44 on main.
Re-applied local modifications to 5 files.
WARNING: upstream 7aeeddc44 no longer has franka_description/robots/fr3_duo/fr3_duo_mount; remove it from vendored_paths or restore it.
WARNING: upstream 7aeeddc44 no longer has franka_description/meshes/accessories/fr3_duo_mount; remove it from vendored_paths or restore it.
Conflicts while re-applying local modifications:
  src/external_dependencies/franka_config/franka_description/CMakeLists.txt
  src/external_dependencies/franka_config/franka_description/package.xml
Resolve the markers, then run bin/validate_workspace_dependencies.py --verify-upstream. The pin is already bumped; to discard: git restore --source=HEAD --staged --worktree -- src/external_dependencies/franka_config && git clean -fd -- src/external_dependencies/franka_config

Workflow run

@coderabbitai

coderabbitai Bot commented Oct 11, 2026

Copy link
Copy Markdown

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: eacc1103-591e-4371-b6ca-22d58680fb2f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

@github-actions

Copy link
Copy Markdown

MoveIt Pro Example WS - Objectives Integration Test Report

  • lab_sim
    • ❌ jazzy: no report produced — see run logs
  • hangar_sim
    • ❌ jazzy: no report produced — see run logs

This branch has not been deployed

No deployments
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.

1 participant