Skip to content

Commit 5998124

Browse files
authored
fix: remove duplicate base uv.lock from workflows (forward-port #13326 to main) (#13427)
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
1 parent a0e7fb7 commit 5998124

10 files changed

Lines changed: 3 additions & 17317 deletions

.github/changes-filter.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ python:
66
- "pyproject.toml"
77
- "uv.lock"
88
- "src/backend/base/pyproject.toml"
9-
- "src/backend/base/uv.lock"
109
- "src/lfx/pyproject.toml"
1110
- "**/python_test.yml"
1211
- ".github/workflows/ci.yml"

.github/workflows/nightly_build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,9 @@ jobs:
169169
uv run --no-sync ./scripts/ci/update_pyproject_combined.py main $RELEASE_TAG $BASE_TAG $LFX_TAG
170170
171171
uv lock
172-
cd src/backend/base && uv lock && cd ../../..
173172
cd src/lfx && uv lock && cd ../..
174173
175-
git add pyproject.toml src/backend/base/pyproject.toml src/lfx/pyproject.toml src/sdk/pyproject.toml uv.lock src/backend/base/uv.lock
174+
git add pyproject.toml src/backend/base/pyproject.toml src/lfx/pyproject.toml src/sdk/pyproject.toml uv.lock
176175
# update_lfx_version.py re-pins each bundle's `lfx` dep to
177176
# lfx-nightly==<dev>, so any modified bundle pyprojects need to
178177
# ride the same commit/tag as the rest of the version bumps.

.secrets.baseline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
"filename": ".github/workflows/nightly_build.yml",
188188
"hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
189189
"is_verified": false,
190-
"line_number": 305,
190+
"line_number": 304,
191191
"is_secret": false
192192
}
193193
],

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,14 +398,13 @@ dcdev_up:
398398
$(DOCKER) compose -f docker/dev.docker-compose.yml up --remove-orphans
399399

400400
lock_base:
401-
cd src/backend/base && uv lock
401+
uv lock
402402

403403
lock_langflow:
404404
uv lock
405405

406406
lock: ## lock dependencies
407407
@echo 'Locking dependencies'
408-
cd src/backend/base && uv lock
409408
uv lock
410409

411410
update: ## update dependencies

docker/build_and_push.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ COPY ./uv.lock /app/uv.lock
4848
COPY ./README.md /app/README.md
4949
COPY ./pyproject.toml /app/pyproject.toml
5050
COPY ./src/backend/base/README.md /app/src/backend/base/README.md
51-
COPY ./src/backend/base/uv.lock /app/src/backend/base/uv.lock
5251
COPY ./src/backend/base/pyproject.toml /app/src/backend/base/pyproject.toml
5352
COPY ./src/lfx/README.md /app/src/lfx/README.md
5453
COPY ./src/lfx/pyproject.toml /app/src/lfx/pyproject.toml

docker/build_and_push_base.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ COPY ./uv.lock /app/uv.lock
4242
COPY ./README.md /app/README.md
4343
COPY ./pyproject.toml /app/pyproject.toml
4444
COPY ./src/backend/base/README.md /app/src/backend/base/README.md
45-
COPY ./src/backend/base/uv.lock /app/src/backend/base/uv.lock
4645
COPY ./src/backend/base/pyproject.toml /app/src/backend/base/pyproject.toml
4746
# Copy lfx metadata files since it's a workspace member
4847
COPY ./src/lfx/pyproject.toml /app/src/lfx/pyproject.toml

docker/build_and_push_ep.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ COPY ./uv.lock /app/uv.lock
4141
COPY ./README.md /app/README.md
4242
COPY ./pyproject.toml /app/pyproject.toml
4343
COPY ./src/backend/base/README.md /app/src/backend/base/README.md
44-
COPY ./src/backend/base/uv.lock /app/src/backend/base/uv.lock
4544
COPY ./src/backend/base/pyproject.toml /app/src/backend/base/pyproject.toml
4645
COPY ./src/lfx/README.md /app/src/lfx/README.md
4746
COPY ./src/lfx/pyproject.toml /app/src/lfx/pyproject.toml

docker/build_and_push_with_extras.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ COPY ./uv.lock /app/uv.lock
4141
COPY ./README.md /app/README.md
4242
COPY ./pyproject.toml /app/pyproject.toml
4343
COPY ./src/backend/base/README.md /app/src/backend/base/README.md
44-
COPY ./src/backend/base/uv.lock /app/src/backend/base/uv.lock
4544
COPY ./src/backend/base/pyproject.toml /app/src/backend/base/pyproject.toml
4645
COPY ./src/lfx/README.md /app/src/lfx/README.md
4746
COPY ./src/lfx/pyproject.toml /app/src/lfx/pyproject.toml

docker/dev.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN --mount=type=cache,target=/root/.cache/uv \
2121
--mount=type=bind,source=README.md,target=README.md \
2222
--mount=type=bind,source=pyproject.toml,target=pyproject.toml \
2323
--mount=type=bind,source=src/backend/base/README.md,target=src/backend/base/README.md \
24-
--mount=type=bind,source=src/backend/base/uv.lock,target=src/backend/base/uv.lock \
2524
--mount=type=bind,source=src/backend/base/pyproject.toml,target=src/backend/base/pyproject.toml \
2625
--mount=type=bind,source=src/lfx/README.md,target=src/lfx/README.md \
2726
--mount=type=bind,source=src/lfx/pyproject.toml,target=src/lfx/pyproject.toml \

src/backend/base/uv.lock

Lines changed: 0 additions & 17306 deletions
This file was deleted.

0 commit comments

Comments
 (0)