Skip to content

fix(container): pin UV binary to build platform in cross-compilation stages #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raballew merged 2 commits into from
Jun 22, 2026
+10 −4
Merged

fix(container): pin UV binary to build platform in cross-compilation stages #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f79d7b
fix(container): pin UV binary to build platform in cross-compilation …
raballew Jun 22, 2026
0bc05af
fix(test): isolate uv cache per package to prevent parallel race
raballew Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion python/.devfile/Containerfile.client
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM --platform=$BUILDPLATFORM ghcr.io/astral-sh/uv:0.11.21@sha256:ff07b86af50d4d9391d9daf4ff89ce427bc544f9aae87057e69a1cc0aa369946 AS uv-bin
FROM --platform=$BUILDPLATFORM registry.fedoraproject.org/fedora:44 AS builder
COPY --from=ghcr.io/astral-sh/uv:0.11.21@sha256:ff07b86af50d4d9391d9daf4ff89ce427bc544f9aae87057e69a1cc0aa369946 /uv /uvx /bin/
COPY --from=uv-bin /uv /uvx /bin/
RUN dnf install -y make git && \
dnf clean all && \
rm -rf /var/cache/dnf
Expand Down
3 changes: 3 additions & 0 deletions python/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,7 @@ cython_debug/

# Ruff cache
.ruff_cache/

# Per-package uv cache (parallel test isolation)
.uv-cache/
mitmproxy-ca-cert.pem
3 changes: 2 additions & 1 deletion python/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM --platform=$BUILDPLATFORM ghcr.io/astral-sh/uv:0.11.21@sha256:ff07b86af50d4d9391d9daf4ff89ce427bc544f9aae87057e69a1cc0aa369946 AS uv-bin
FROM --platform=$BUILDPLATFORM registry.fedoraproject.org/fedora:44 AS builder
COPY --from=ghcr.io/astral-sh/uv:0.11.21@sha256:ff07b86af50d4d9391d9daf4ff89ce427bc544f9aae87057e69a1cc0aa369946 /uv /uvx /bin/
COPY --from=uv-bin /uv /uvx /bin/
RUN dnf install -y make git && \
dnf clean all && \
rm -rf /var/cache/dnf
Expand Down
5 changes: 3 additions & 2 deletions python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ pkg-test-%: packages/%
@mkdir -p $(LOGS_DIR)
@rm -f $(LOGS_DIR)/$*.failed
@bash -c 'set -o pipefail; \
PYTHONUNBUFFERED=1 uv run --isolated --directory $< pytest 2>&1 | tee $(LOGS_DIR)/$*.log; \
UV_CACHE_DIR="$(CURDIR)/.uv-cache/$*" PYTHONUNBUFFERED=1 uv run --isolated --directory $< pytest 2>&1 | tee $(LOGS_DIR)/$*.log; \
rc=$$?; \
if [ $$rc -ne 0 ] && [ $$rc -ne 5 ]; then \
touch $(LOGS_DIR)/$*.failed; \
fi; \
true'
else
pkg-test-%: packages/%
uv run --isolated --directory $< pytest || [ $$? -eq 5 ]
UV_CACHE_DIR="$(CURDIR)/.uv-cache/$*" uv run --isolated --directory $< pytest || [ $$? -eq 5 ]
endif

pkg-ty-%: packages/%
Expand Down Expand Up @@ -147,6 +147,7 @@ clean-test:
-rm -f .coverage
-rm -f coverage.xml
-rm -rf htmlcov
-rm -rf .uv-cache

clean-docs:
uv run --isolated --all-packages --group docs $(MAKE) -C docs clean
Expand Down
Loading