Skip to content

Commit aa1b82a

Browse files
fix(bots): bump engine pin to latest main (d9cb1e6); map Feature/Task ⇒ task
The prior pin (d24ca21) used the `enhancement` flow, but engine main has since renamed it to `task`. Bump the 4-way engine pin to current main HEAD (d9cb1e6) and update the Type→flow mapping to match the renamed flow: Bug ⇒ bug-fix, Task/Feature ⇒ task (was Feature ⇒ enhancement) Without this, a Feature-typed issue would pass `--flow enhancement`, which the engine's `choices` no longer accepts (runtime failure). Also handles Task (previously fell through to config default). SDK/CLI pins unchanged (0.2.102 / 2.1.61, still matching the engine at d9cb1e6). Header + author-run comments updated to match. Signed-off-by: Eric Wang <e.wang@databricks.com> Co-authored-by: Isaac Signed-off-by: eric-wang-1990 <e.wang@databricks.com>
1 parent 8bb4b16 commit aa1b82a

4 files changed

Lines changed: 14 additions & 12 deletions

File tree

.github/workflows/engineer-bot-followup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
# Pinned engine SHA. DUPLICATED in all four bot workflows
106106
# (engineer-bot{,-followup}.yml, reviewer-bot{,-followup}.yml) — bump
107107
# them in LOCKSTEP or the bots silently run different engine versions.
108-
engine-ref: d24ca2171d191a652a67f4f43995f0959c9a5791
108+
engine-ref: d9cb1e63dc31eed550194a29d1cfd7de9c9c793b
109109

110110
# Run the follow-up. Inlines the engine's bot-run env contract for
111111
# engineer:followup, plus the authenticated push remote bot-run would set

.github/workflows/engineer-bot.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#
33
# A maintainer labels an ISSUE with `engineer-bot`; the bot addresses it and opens
44
# a PR. The author FLOW is chosen from the issue's TYPE (a GitHub org-level Issue
5-
# Type): `Bug` ⇒ bug-fix (reproduce with a failing test, then fix); `Feature`
6-
# enhancement (smallest correct change); any other type / none ⇒ the repo's
5+
# Type): `Bug` ⇒ bug-fix (reproduce with a failing test, then fix); `Task`/`Feature`
6+
# ⇒ task (smallest correct change); any other type / none ⇒ the repo's
77
# .bot/config.yaml `flow:` default. Set the Type BEFORE `engineer-bot` — it's read
88
# live when the run starts. Driven by the selected flow + this repo's .bot/
99
# (config + prompts).
@@ -92,7 +92,7 @@ jobs:
9292
# Pinned engine SHA. DUPLICATED in all four bot workflows
9393
# (engineer-bot{,-followup}.yml, reviewer-bot{,-followup}.yml) — bump
9494
# them in LOCKSTEP or the bots silently run different engine versions.
95-
engine-ref: d24ca2171d191a652a67f4f43995f0959c9a5791
95+
engine-ref: d9cb1e63dc31eed550194a29d1cfd7de9c9c793b
9696

9797
- name: Resolve issue + gather context
9898
id: ctx
@@ -134,13 +134,15 @@ jobs:
134134
# set AFTER this fetch is not seen — set the type BEFORE `engineer-bot`).
135135
# The type→flow MAPPING is pinned (not "use the type name as the flow")
136136
# so an arbitrary custom org type can never select an engine flow:
137-
# Bug ⇒ bug-fix (red→green TDD) Feature ⇒ enhancement (small-change)
138-
# Any other type (incl. Task) or no type ⇒ emit nothing ⇒ the author
139-
# step omits --flow ⇒ the engine uses .bot/config.yaml `flow:`.
137+
# Bug ⇒ bug-fix (red→green TDD)
138+
# Task/Feature ⇒ task (single-pass, smallest correct change; the engine
139+
# has no separate `enhancement` flow — it was renamed to `task`)
140+
# Any other type or no type ⇒ emit nothing ⇒ the author step omits
141+
# --flow ⇒ the engine uses .bot/config.yaml `flow:`.
140142
TYPE="$(jq -r '.type.name // ""' "$RUNNER_TEMP/issue.json")"
141143
case "$TYPE" in
142-
Bug) echo "flow=bug-fix" >> "$GITHUB_OUTPUT" ;;
143-
Feature) echo "flow=enhancement" >> "$GITHUB_OUTPUT" ;;
144+
Bug) echo "flow=bug-fix" >> "$GITHUB_OUTPUT" ;;
145+
Task|Feature) echo "flow=task" >> "$GITHUB_OUTPUT" ;;
144146
esac
145147
DELIM="GHEOF_$(date +%s%N)${RANDOM}"
146148
if printf '%s' "$TITLE" | grep -qF "$DELIM"; then
@@ -158,7 +160,7 @@ jobs:
158160
# $GITHUB_ENV (the bot config's author.env_tokens).
159161
#
160162
# The author FLOW is chosen from the issue TYPE by the ctx step above
161-
# (Bug ⇒ bug-fix, Feature ⇒ enhancement). We pass --flow ONLY when that
163+
# (Bug ⇒ bug-fix, Task/Feature ⇒ task). We pass --flow ONLY when that
162164
# step derived one: an empty --flow would be rejected by the CLI's
163165
# `choices`, and omitting it lets the engine fall back to the
164166
# .bot/config.yaml `flow:` default (no/other type, or type-set-late case).

.github/workflows/reviewer-bot-followup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# Pinned engine SHA. DUPLICATED in all four bot workflows
8181
# (engineer-bot{,-followup}.yml, reviewer-bot{,-followup}.yml) — bump
8282
# them in LOCKSTEP or the bots silently run different engine versions.
83-
engine-ref: d24ca2171d191a652a67f4f43995f0959c9a5791
83+
engine-ref: d9cb1e63dc31eed550194a29d1cfd7de9c9c793b
8484

8585
- name: Run reviewer follow-up
8686
env:

.github/workflows/reviewer-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
# Pinned engine SHA. DUPLICATED in all four bot workflows
8686
# (engineer-bot{,-followup}.yml, reviewer-bot{,-followup}.yml) — bump
8787
# them in LOCKSTEP or the bots silently run different engine versions.
88-
engine-ref: d24ca2171d191a652a67f4f43995f0959c9a5791
88+
engine-ref: d9cb1e63dc31eed550194a29d1cfd7de9c9c793b
8989

9090
- name: Resolve trigger inputs
9191
id: inputs

0 commit comments

Comments
 (0)