Skip to content

ci: fix kilted branch CI to actually test against kilted - #3769

Merged
nbbrooks merged 1 commit into
moveit:kiltedfrom
nbbrooks:nbbrooks/fix-kilted-ci-config
Jun 23, 2026
Merged

nbbrooks merged 1 commit into
moveit:kiltedfrom
nbbrooks:nbbrooks/fix-kilted-ci-config

Conversation

@nbbrooks

Copy link
Copy Markdown
Collaborator

When the kilted branch was forked from main, two workflow files were overlooked and still target rolling/humble/jazzy:

  1. .github/workflows/ci.yaml's matrix was testing kilted-branch code against rolling-ci/humble-ci/jazzy-ci images. PR CI thus failed for reasons unrelated to the PR (e.g. mergify-backported Fix ERROR stream + check only active controllers for multiple chained controllers (backport #3556) #3768 failed all 6 jobs because they ran on rolling+humble+jazzy infrastructure that doesn't match kilted's expected toolchain).

  2. .github/workflows/docker.yaml's matrix kept ROS_DISTRO=[rolling], so the kilted branch never built its own moveit/moveit2:kilted-ci / kilted-release / kilted-source images. The push trigger also still pointed at branches: [main].

Match the jazzy branch's pattern: ci.yaml uses kilted-ci for both ccov and ikfast+clang-tidy jobs; docker.yaml builds kilted images and triggers on pushes to kilted.

Followup work after this lands:

Description

Please explain the changes you made, including a reference to the related issue if applicable

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

When the kilted branch was forked from main, two workflow files were
overlooked and still target rolling/humble/jazzy:

1. .github/workflows/ci.yaml's matrix was testing kilted-branch code
   against rolling-ci/humble-ci/jazzy-ci images. PR CI thus failed for
   reasons unrelated to the PR (e.g. mergify-backported moveit#3768 failed
   all 6 jobs because they ran on rolling+humble+jazzy infrastructure
   that doesn't match kilted's expected toolchain).

2. .github/workflows/docker.yaml's matrix kept ROS_DISTRO=[rolling],
   so the kilted branch never built its own moveit/moveit2:kilted-ci /
   kilted-release / kilted-source images. The push trigger also still
   pointed at branches: [main].

Match the jazzy branch's pattern: ci.yaml uses kilted-ci for both ccov
and ikfast+clang-tidy jobs; docker.yaml builds kilted images and triggers
on pushes to kilted.

Followup work after this lands:
- Trigger docker.yaml manually (workflow_dispatch on kilted) to build
  the first set of kilted-ci/release/source Docker images, OR push any
  commit to kilted to trigger automatically.
- Once moveit/moveit2:kilted-ci exists, re-run CI on PR moveit#3768 (and
  any other open kilted backports) so they have a real toolchain to
  test against.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@mergify

mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@mergify

mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown

Please target the main branch for development, we will backport the changes to kilted for you if approved and if they don't break API.

@nbbrooks
nbbrooks merged commit 43cbf9d into moveit:kilted Jun 23, 2026
8 of 12 checks passed
@github-project-automation github-project-automation Bot moved this to ✅ Done in MoveIt Jun 23, 2026
nbbrooks added a commit to nbbrooks/moveit2 that referenced this pull request Jun 23, 2026
…sections

Document the unified per-distro branch CI policy established by:
- Topic 3 §"Per-distro branches": which workflows live on per-distro
  branches (ci/docker/docker_lint/format only) vs main-only
  (prerelease/sonar/stale/tutorial_docker).
- Topic 3 §"Forking a new per-distro branch": the exact bootstrap
  changes when a new ROS distro lands. Captures the lessons from the
  kilted-branch retrofit (moveit#3769) where ci.yaml/docker.yaml/tutorial
  workflows were left targeting rolling/main after the fork from main.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
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