Skip to content

Commit d5721ae

Browse files
edburnsCopilot
andcommitted
Fix review issues in codegen workflows
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent e026641 commit d5721ae

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

.github/workflows/codegen-check.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ jobs:
9999
env:
100100
COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
101101
run: |
102+
set -o pipefail
102103
mvn verify 2>&1 | tee /tmp/mvn-verify-output.txt
103104
echo "exit_code=$?" >> "$GITHUB_OUTPUT"
104105
@@ -131,19 +132,22 @@ jobs:
131132
if: steps.trigger-fix.outcome == 'success'
132133
env:
133134
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
135+
BRANCH: ${{ github.head_ref }}
134136
run: |
135137
echo "Waiting for agentic fix workflow to start..."
136138
sleep 30
137139
138140
for i in $(seq 1 60); do
139141
RUN_ID=$(gh run list \
140142
--workflow=codegen-agentic-fix.lock.yml \
143+
--branch="$BRANCH" \
141144
--limit=1 \
142145
--json databaseId,status \
143146
--jq '.[0].databaseId')
144147
145148
STATUS=$(gh run list \
146149
--workflow=codegen-agentic-fix.lock.yml \
150+
--branch="$BRANCH" \
147151
--limit=1 \
148152
--json databaseId,status \
149153
--jq '.[0].status')

.github/workflows/update-copilot-dependency.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
> Created by the **Update @github/copilot Dependency** workflow." \
160160
--base main \
161161
--head "$BRANCH" \
162-
| grep -oP '\d+$' || gh pr view "$BRANCH" --json number --jq .number)
162+
| grep -oE '[0-9]+$' || gh pr view "$BRANCH" --json number --jq .number)
163163
fi
164164
echo "pr_number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
165165
@@ -179,6 +179,7 @@ jobs:
179179
env:
180180
COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
181181
run: |
182+
set -o pipefail
182183
mvn verify 2>&1 | tee /tmp/mvn-verify-output.txt
183184
echo "exit_code=$?" >> "$GITHUB_OUTPUT"
184185
@@ -214,20 +215,22 @@ jobs:
214215
if: steps.trigger-fix.outcome == 'success'
215216
env:
216217
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
218+
BRANCH: ${{ steps.commit-changes.outputs.branch }}
217219
run: |
218220
echo "Waiting for agentic fix workflow to start..."
219221
sleep 30
220222
221-
# Find the most recent run of codegen-agentic-fix triggered after us
222223
for i in $(seq 1 60); do
223224
RUN_ID=$(gh run list \
224225
--workflow=codegen-agentic-fix.lock.yml \
226+
--branch="$BRANCH" \
225227
--limit=1 \
226228
--json databaseId,status \
227229
--jq '.[0].databaseId')
228230
229231
STATUS=$(gh run list \
230232
--workflow=codegen-agentic-fix.lock.yml \
233+
--branch="$BRANCH" \
231234
--limit=1 \
232235
--json databaseId,status \
233236
--jq '.[0].status')

0 commit comments

Comments
 (0)