Skip to content

Fix CI: resolve copier conflict markers from #253 - #274

Merged
gilesknap merged 2 commits into
mainfrom
fix-ci-workflow
Oct 6, 2026
Merged

gilesknap merged 2 commits into
mainfrom
fix-ci-workflow

Conversation

@gilesknap

@gilesknap gilesknap commented Oct 6, 2026 •

Copy link
Copy Markdown
Member

The Renovate copier update committed unresolved conflict markers in ci.yml and pyproject.toml, so the workflow failed to parse and ran no jobs. Take the template side: adopt the new lint and test jobs and the template [project] block (distribution renamed to epics-containers), point docs/conf.py's version lookup at the new name, and relock uv.lock.

Claude-Session: https://claude.ai/code/session_01HEadCafQcH99QcitezEp8A

Summary by CodeRabbit

  • Documentation
    • Documentation release versions now use the installed epics-containers package version, while the existing release-to-branch selection remains unchanged.
  • Chores
    • The project metadata now consistently identifies the package as epics-containers.
    • Removed stray merge-conflict markers from project and CI configuration.

The Renovate copier update committed unresolved conflict markers in
ci.yml and pyproject.toml, so the workflow failed to parse and ran no
jobs. Take the template side: adopt the new lint and test jobs and the
template [project] block (distribution renamed to epics-containers),
point docs/conf.py's version lookup at the new name, and relock uv.lock.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HEadCafQcH99QcitezEp8A
@coderabbitai

coderabbitai Bot commented Oct 6, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

Warning

Review limit reached

This review ran on the open-source allowance, not this organization's plan, because the pull request author doesn't have an assigned seat. Waiting won't change this — ask an organization admin to assign them a seat, or add seats in Billing if every seat is already assigned, then retry.

Next included review available in 47 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

⚙️ Run configuration
  • Configuration used: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 09571763-294e-41f9-84b8-d911daeb34a4
📥 Commits

Reviewing files that changed from the base of the PR and between 2c02571 and 1e7f369.

📒 Files selected for processing (1)
  • pyproject.toml

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 53ee69b3-0999-445b-b86c-eb505fa3c0b9
📥 Commits

Reviewing files that changed from the base of the PR and between 6375a9c and 2c02571.

⛔ Files ignored due to path filters (1)
  • uv.lock is excluded by !**/*.lock
📒 Files selected for processing (3)
  • .github/workflows/ci.yml
  • docs/conf.py
  • pyproject.toml
💤 Files with no reviewable changes (2)
  • .github/workflows/ci.yml
  • pyproject.toml

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.


📝 Walkthrough

Walkthrough

The project configuration and CI workflow no longer contain merge-conflict markers. The project name remains epics-containers, and the documentation release lookup now uses that installed distribution name. The existing release-to-branch version selection is unchanged.

Changes

Project Configuration

Layer / File(s) Summary
Project and CI configuration cleanup
.github/workflows/ci.yml, pyproject.toml
The project configuration retains epics-containers and removes merge-conflict markers. The CI workflow also removes merge-conflict markers.
Documentation release lookup
docs/conf.py
The release lookup uses the installed distribution name epics-containers. The existing release-to-branch version selection is unchanged.

Priority: ➖ Normal

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Merge Risk: ⚪ Minimal · up to 2c025

Project metadata, the lockfile, CI configuration, and the documentation version lookup are aligned. No actionable merge-blocking risk remains; normal CI execution will confirm end-to-end behavior.

Architecture Summary

Architecture risk: 🔵 Low · up to 2c025

The change affects 2 systems.

Changed systems: docs, pyproject.toml

Architecture concerns
No architecture-level concerns identified.

Review details

Systems and components

  • observed — docs (service) was modified; 1 changed file maps to changed impact.
  • observed — pyproject.toml (service) was modified; 1 changed file maps to changed impact.

Before / after behavior

  • observed — Modified behavior in docs/conf.py: The release lookup now uses the installed distribution name epics-containers rather than project.
  • observed — Modified behavior in pyproject.toml: Removed the conflict block containing the alternative project name epics-containers.github.io; the [project] configuration retains epics-containers.
  • observed — Modified behavior in pyproject.toml: Removed the trailing merge-conflict marker after the dependencies setting.
  • observed — Modified behavior in .github/workflows/ci.yml: Removed the <<<<<<< before updating and ======= conflict-marker lines before the jobs.
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the main change: resolving copier conflict markers that caused CI to fail.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1…
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.
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

The template [project] block has no requires-python, so with UV_PYTHON
set per matrix job uv inferred the range from the interpreter and the
3.12+ test jobs failed `uv run --locked` against the >=3.11 lock.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HEadCafQcH99QcitezEp8A
@gilesknap
gilesknap merged commit 1c1f2ad into main Oct 6, 2026
8 checks passed
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