Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions .github/workflows/engineer-bot-followup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,20 @@ jobs:
with:
python-version: '3.11'

# setup-poetry runs `poetry lock` (to reconcile the lock with the internal
# JFrog source it injects), which REWRITES tracked poetry.lock / pyproject.toml
# in the working tree. The venv is already built, so the tree no longer needs
# that churn — revert it, else the followup's fixup commit (or its leftover
# check) would sweep up these bot-untouched dirty files. Keep ONLY the
# agent's edits in the tree.
- name: Revert poetry lock/pyproject churn (keep only the agent's edits)
# No `|| true`: `git checkout -- <tracked-file>` exits 0 for both the
# clean and the reverted-churn cases, so a non-zero exit means the revert
# genuinely failed (e.g. the files went untracked/missing) and the dirty
# tree would otherwise be swept into the followup's fixup commit. Fail
# loudly here instead of masking it.
run: git checkout -- poetry.lock pyproject.toml

# Shared prelude: mint the engineer-bot token (pushes fixup commits, posts
# replies) + the engine-scoped token, set up Node, install the engine.
- name: Bot prelude (tokens + Node + engine install)
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/engineer-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,20 @@ jobs:
with:
python-version: '3.11'

# setup-poetry runs `poetry lock` (to reconcile the lock with the internal
# JFrog source it injects), which REWRITES tracked poetry.lock / pyproject.toml
# in the working tree. The venv is already built, so the tree no longer needs
# that churn — revert it, else publish's leftover safety-net sees these
# bot-untouched dirty files and refuses to open the PR (they aren't in the
# agent's touched_files). Keep ONLY the agent's edits in the tree.
Comment thread
peco-review-bot[bot] marked this conversation as resolved.
- name: Revert poetry lock/pyproject churn (keep only the agent's edits)
# No `|| true`: `git checkout -- <tracked-file>` exits 0 for both the
# clean and the reverted-churn cases, so a non-zero exit means the revert
# genuinely failed (e.g. the files went untracked/missing) and the dirty
# tree would otherwise resurface as a confusing publish-time error. Fail
# loudly here instead of masking it.
run: git checkout -- poetry.lock pyproject.toml

# Shared prelude: mint the engineer-bot token (pushes the fix branch,
# comments) + the engine-scoped token, set up Node, install the pinned
# engine (PAT-free). `token` output is used by the steps below.
Expand Down
Loading