mirror of
https://github.com/hanzoai/flow.git
synced 2026-10-17 01:29:18 +00:00
fix: remove duplicate uv.lock from workspace member Forward-port of #13326 to main. The monorepo should keep only one uv.lock at the workspace root; src/backend/base/uv.lock was a stale duplicate. The scheduled nightly build runs from main's workflow definition, so create-nightly-tag still ran `git add ... src/backend/base/uv.lock` against a tree where the file no longer exists, failing with exit 128. - Delete src/backend/base/uv.lock - nightly_build.yml: drop base-dir `uv lock` regeneration and the base lockfile from `git add` - Remove COPY/bind-mount of the base lockfile from all Dockerfiles - Makefile: lock_base/lock now lock only the root workspace - changes-filter.yaml: drop the base lockfile path - .secrets.baseline: shift nightly_build.yml line number 305 -> 304 Fixes the failing nightly: https://github.com/langflow-ai/langflow/actions/runs/26699469476
This commit is contained in:
@@ -6,7 +6,6 @@ python:
|
||||
- "pyproject.toml"
|
||||
- "uv.lock"
|
||||
- "src/backend/base/pyproject.toml"
|
||||
- "src/backend/base/uv.lock"
|
||||
- "src/lfx/pyproject.toml"
|
||||
- "**/python_test.yml"
|
||||
- ".github/workflows/ci.yml"
|
||||
|
||||
@@ -169,10 +169,9 @@ jobs:
|
||||
uv run --no-sync ./scripts/ci/update_pyproject_combined.py main $RELEASE_TAG $BASE_TAG $LFX_TAG
|
||||
|
||||
uv lock
|
||||
cd src/backend/base && uv lock && cd ../../..
|
||||
cd src/lfx && uv lock && cd ../..
|
||||
|
||||
git add pyproject.toml src/backend/base/pyproject.toml src/lfx/pyproject.toml src/sdk/pyproject.toml uv.lock src/backend/base/uv.lock
|
||||
git add pyproject.toml src/backend/base/pyproject.toml src/lfx/pyproject.toml src/sdk/pyproject.toml uv.lock
|
||||
# update_lfx_version.py re-pins each bundle's `lfx` dep to
|
||||
# lfx-nightly==<dev>, so any modified bundle pyprojects need to
|
||||
# ride the same commit/tag as the rest of the version bumps.
|
||||
|
||||
+1
-1
@@ -187,7 +187,7 @@
|
||||
"filename": ".github/workflows/nightly_build.yml",
|
||||
"hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
|
||||
"is_verified": false,
|
||||
"line_number": 305,
|
||||
"line_number": 304,
|
||||
"is_secret": false
|
||||
}
|
||||
],
|
||||
|
||||
@@ -398,14 +398,13 @@ dcdev_up:
|
||||
$(DOCKER) compose -f docker/dev.docker-compose.yml up --remove-orphans
|
||||
|
||||
lock_base:
|
||||
cd src/backend/base && uv lock
|
||||
uv lock
|
||||
|
||||
lock_langflow:
|
||||
uv lock
|
||||
|
||||
lock: ## lock dependencies
|
||||
@echo 'Locking dependencies'
|
||||
cd src/backend/base && uv lock
|
||||
uv lock
|
||||
|
||||
update: ## update dependencies
|
||||
|
||||
@@ -48,7 +48,6 @@ COPY ./uv.lock /app/uv.lock
|
||||
COPY ./README.md /app/README.md
|
||||
COPY ./pyproject.toml /app/pyproject.toml
|
||||
COPY ./src/backend/base/README.md /app/src/backend/base/README.md
|
||||
COPY ./src/backend/base/uv.lock /app/src/backend/base/uv.lock
|
||||
COPY ./src/backend/base/pyproject.toml /app/src/backend/base/pyproject.toml
|
||||
COPY ./src/lfx/README.md /app/src/lfx/README.md
|
||||
COPY ./src/lfx/pyproject.toml /app/src/lfx/pyproject.toml
|
||||
|
||||
@@ -42,7 +42,6 @@ COPY ./uv.lock /app/uv.lock
|
||||
COPY ./README.md /app/README.md
|
||||
COPY ./pyproject.toml /app/pyproject.toml
|
||||
COPY ./src/backend/base/README.md /app/src/backend/base/README.md
|
||||
COPY ./src/backend/base/uv.lock /app/src/backend/base/uv.lock
|
||||
COPY ./src/backend/base/pyproject.toml /app/src/backend/base/pyproject.toml
|
||||
# Copy lfx metadata files since it's a workspace member
|
||||
COPY ./src/lfx/pyproject.toml /app/src/lfx/pyproject.toml
|
||||
|
||||
@@ -41,7 +41,6 @@ COPY ./uv.lock /app/uv.lock
|
||||
COPY ./README.md /app/README.md
|
||||
COPY ./pyproject.toml /app/pyproject.toml
|
||||
COPY ./src/backend/base/README.md /app/src/backend/base/README.md
|
||||
COPY ./src/backend/base/uv.lock /app/src/backend/base/uv.lock
|
||||
COPY ./src/backend/base/pyproject.toml /app/src/backend/base/pyproject.toml
|
||||
COPY ./src/lfx/README.md /app/src/lfx/README.md
|
||||
COPY ./src/lfx/pyproject.toml /app/src/lfx/pyproject.toml
|
||||
|
||||
@@ -41,7 +41,6 @@ COPY ./uv.lock /app/uv.lock
|
||||
COPY ./README.md /app/README.md
|
||||
COPY ./pyproject.toml /app/pyproject.toml
|
||||
COPY ./src/backend/base/README.md /app/src/backend/base/README.md
|
||||
COPY ./src/backend/base/uv.lock /app/src/backend/base/uv.lock
|
||||
COPY ./src/backend/base/pyproject.toml /app/src/backend/base/pyproject.toml
|
||||
COPY ./src/lfx/README.md /app/src/lfx/README.md
|
||||
COPY ./src/lfx/pyproject.toml /app/src/lfx/pyproject.toml
|
||||
|
||||
@@ -21,7 +21,6 @@ RUN --mount=type=cache,target=/root/.cache/uv \
|
||||
--mount=type=bind,source=README.md,target=README.md \
|
||||
--mount=type=bind,source=pyproject.toml,target=pyproject.toml \
|
||||
--mount=type=bind,source=src/backend/base/README.md,target=src/backend/base/README.md \
|
||||
--mount=type=bind,source=src/backend/base/uv.lock,target=src/backend/base/uv.lock \
|
||||
--mount=type=bind,source=src/backend/base/pyproject.toml,target=src/backend/base/pyproject.toml \
|
||||
--mount=type=bind,source=src/lfx/README.md,target=src/lfx/README.md \
|
||||
--mount=type=bind,source=src/lfx/pyproject.toml,target=src/lfx/pyproject.toml \
|
||||
|
||||
Generated
-17306
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user