Skip to content

ci: drop vestigial sibling vendoring; harden Java deploy; fix Python SDK version drift#37

Merged
ancongui merged 1 commit into
mainfrom
ci/cicd-cleanup-drop-vendoring
Jun 15, 2026
Merged

ci: drop vestigial sibling vendoring; harden Java deploy; fix Python SDK version drift#37
ancongui merged 1 commit into
mainfrom
ci/cicd-cleanup-drop-vendoring

Conversation

@ancongui

Copy link
Copy Markdown
Contributor

Summary

Follow-up CI/CD cleanup after pyfly + fireflyframework-agentic became git dependencies (pinned tags in [tool.uv.sources]). An audit of all three flydocs workflows surfaced dead code plus two latent issues. The release-path failures fixed earlier (docker-publish concurrency race; Java 409 idempotency) are already on main and validated green.

Changes

Remove vestigial sibling-repo vendoring (no behaviour change)

uv sync already fetched both deps from git in every prior build — the path-rewrite sed had silently no-op'd since the switch to git sources, so the ./vendor clone + BuildKit contexts were pure waste.

  • pr-gate.yaml — drop the "Check out sibling repos" + "Repoint uv path sources" steps from lint/typecheck/unit/docling-tests, and the clone + build-contexts from docker-build. Drop misleading PYFLY_REF/AGENTIC_REF env (pointed at main while pyproject pins tags).
  • docker-publish.yaml — remove the ./vendor clone, build-contexts, PYFLY_REF/AGENTIC_REF env, and the unused tag_suffix workflow input.
  • Dockerfile — remove the COPY --from=pyfly / --from=fireflyframework-agentic staging + the path-rewrite sed. uv sync fetches both from git (git + network already present in the builder stage).
  • pyproject.toml — refresh now-stale [tool.uv.sources] + [tool.ruff] comments.

Harden Java SDK deploy idempotency (publish-sdks.yaml)

The idempotency grep matched a bare conflict, which could swallow unrelated deploy failures (auth, network, corrupt artifact). Now matches only the specific HTTP-409 "already published" wagon errors.

Fix Python SDK version drift

sdks/python/pyproject.toml (26.6.0) and _version.py (26.6.2) disagreed → a source build reported mismatched wheel metadata vs __version__. Aligned both to the service version 26.6.12.

Validation

  • All 3 workflows parse (yaml.safe_load).
  • SDK Python ruff check + format clean; versions coherent at 26.6.12.
  • Service ruff format --check clean on main.
  • This PR's docker-build job (slim + docling) is the authoritative check that the Dockerfile resolves both deps from git without the BuildKit contexts.

🤖 Generated with Claude Code

…SDK version drift

Follow-up CI/CD cleanup after pyfly + fireflyframework-agentic became git
dependencies (pinned tags in [tool.uv.sources]). An audit of all three
flydocs workflows surfaced dead code and two latent issues.

Vendoring removal (no behaviour change — uv already fetched both deps from
git in every prior build; the path-rewrite sed had silently no-op'd since the
switch to git sources):
  * pr-gate.yaml: remove the "Check out sibling firefly framework repos" +
    "Repoint uv path sources" steps from lint/typecheck/unit/docling-tests,
    and the clone + build-contexts from docker-build. Drop the misleading
    PYFLY_REF/AGENTIC_REF env (they pointed at "main" while pyproject pins
    tags).
  * docker-publish.yaml: remove the ./vendor clone + build-contexts + the
    PYFLY_REF/AGENTIC_REF env + the unused tag_suffix workflow input.
  * Dockerfile: remove the COPY --from=pyfly / --from=fireflyframework-agentic
    staging and the path-rewrite sed; uv sync now fetches both from git
    (git + network already available in the builder stage). Update the header.
  * pyproject.toml: refresh the now-stale [tool.uv.sources] + [tool.ruff]
    comments.

publish-sdks.yaml: tighten the Java deploy idempotency grep. The previous
pattern matched a bare "conflict", which could swallow unrelated deploy
failures (auth, network, corrupt artifact). Now matches only the specific
HTTP-409 "already published" wagon errors.

Python SDK version drift: pyproject.toml (26.6.0) and _version.py (26.6.2)
disagreed, so a source build reported mismatched wheel-metadata vs
__version__. Align both to the service version 26.6.12.
@ancongui ancongui merged commit 7881076 into main Jun 15, 2026
8 checks passed
@ancongui ancongui deleted the ci/cicd-cleanup-drop-vendoring branch June 15, 2026 21:16
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