avm/mostovik-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge dev into main #32

Merged
avm merged 31 commits from codex/merge-main-20260616 into main 2026-06-16 16:14:23 +03:00
Conversation 0 Commits 31 Files Changed 151 +9 -1
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a12d7e2e5d - Show all commits

9
.gitea/workflows/ci-cd.yml
View File

@@ -104,9 +104,16 @@ jobs:
fi fi
docker buildx inspect --bootstrap docker buildx inspect --bootstrap
lockfile_sha="$(sha256sum uv.lock | awk '{ print $1 }')"
image_usable() { image_usable() {
docker run --rm "${CI_GOLDEN_REF}:${GOLDEN_TAG}" \ docker run --rm "${CI_GOLDEN_REF}:${GOLDEN_TAG}" \
bash -c '/app/.venv/bin/ruff --version >/dev/null && /app/.venv/bin/python -m pytest --version >/dev/null' bash -c "
test -f /app/uv.lock
test \"\$(sha256sum /app/uv.lock | awk '{ print \$1 }')\" = '${lockfile_sha}'
/app/.venv/bin/ruff --version >/dev/null
/app/.venv/bin/python -m pytest --version >/dev/null
"
} }
if ! docker buildx imagetools inspect "${CI_GOLDEN_REF}:${GOLDEN_TAG}" >/dev/null 2>&1 || ! image_usable; then if ! docker buildx imagetools inspect "${CI_GOLDEN_REF}:${GOLDEN_TAG}" >/dev/null 2>&1 || ! image_usable; then

1
docker/Dockerfile
View File

@@ -52,6 +52,7 @@ RUN uv sync --frozen --no-install-project --dev
FROM base AS ci-deps-base FROM base AS ci-deps-base
COPY --from=ci-deps-build /app/.venv /app/.venv COPY --from=ci-deps-build /app/.venv /app/.venv
COPY pyproject.toml uv.lock ./
ENV PATH="/app/.venv/bin:${PATH}" \ ENV PATH="/app/.venv/bin:${PATH}" \
PYTHONPATH=/workspace/src \ PYTHONPATH=/workspace/src \