ci: drop vestigial sibling vendoring; harden Java deploy; fix Python SDK version drift#37
Merged
Merged
Conversation
…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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Follow-up CI/CD cleanup after
pyfly+fireflyframework-agenticbecame 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 onmainand validated green.Changes
Remove vestigial sibling-repo vendoring (no behaviour change)
uv syncalready fetched both deps from git in every prior build — the path-rewritesedhad silently no-op'd since the switch to git sources, so the./vendorclone + BuildKit contexts were pure waste.lint/typecheck/unit/docling-tests, and the clone +build-contextsfromdocker-build. Drop misleadingPYFLY_REF/AGENTIC_REFenv (pointed atmainwhile pyproject pins tags)../vendorclone,build-contexts,PYFLY_REF/AGENTIC_REFenv, and the unusedtag_suffixworkflow input.COPY --from=pyfly/--from=fireflyframework-agenticstaging + the path-rewritesed.uv syncfetches both from git (git + network already present in the builder stage).[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 version26.6.12.Validation
26.6.12.ruff format --checkclean onmain.docker-buildjob (slim + docling) is the authoritative check that the Dockerfile resolves both deps from git without the BuildKit contexts.🤖 Generated with Claude Code