@coda-console/review 2.9.0 → 2.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.coda/workflows/pull-request.bpmn +150 -113
- package/README.md +3 -1
- package/package.json +3 -2
|
@@ -268,18 +268,23 @@ GitHub 上各项检查用 `gh pr checks {{github.event.pull_request.html_url}}`
|
|
|
268
268
|
<!-- 合并:你批准过、之后只是合并前检查没通过或 GitHub 没合并(冲突等),这个版本评审通过就按原批准合并;评审要求修改过(review.changesAt 晚于批准)就再问你。 -->
|
|
269
269
|
<subProcess id="merging" name="合并">
|
|
270
270
|
<startEvent id="merging-in" />
|
|
271
|
-
<sequenceFlow id="m-in" sourceRef="merging-in" targetRef="
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
271
|
+
<sequenceFlow id="m-in" sourceRef="merging-in" targetRef="preparing" />
|
|
272
|
+
<!-- PR 关闭只打断等待批准、检查与人工处理的范围。我们发起的合并、关闭命令正常收尾,
|
|
273
|
+
它们产生的关闭事件留在收件箱,合并命令结束后由「等 GitHub 确认」读取。 -->
|
|
274
|
+
<subProcess id="preparing" name="批准与合并前检查">
|
|
275
|
+
<startEvent id="preparing-in" />
|
|
276
|
+
<sequenceFlow id="preparing-started" sourceRef="preparing-in" targetRef="standing" />
|
|
277
|
+
<exclusiveGateway id="standing" name="按原批准合并吗" default="ask" />
|
|
278
|
+
<sequenceFlow id="as-approved" sourceRef="standing" targetRef="premerge">
|
|
279
|
+
<conditionExpression xsi:type="tFormalExpression">=number(approval.at) > number(review.changesAt)</conditionExpression>
|
|
280
|
+
</sequenceFlow>
|
|
281
|
+
<sequenceFlow id="ask" sourceRef="standing" targetRef="kinds" />
|
|
282
|
+
<!-- 批准卡只给项目有的部署、发布:项目在这个提交上没有这一类流程,就没有那个勾选项;有合并前检查的才在卡上说先跑它。 -->
|
|
283
|
+
<serviceTask id="kinds" name="看项目有哪些部署、发布" coda:action="workflow-kinds" />
|
|
284
|
+
<sequenceFlow id="kinds-known" sourceRef="kinds" targetRef="approve" />
|
|
285
|
+
|
|
286
|
+
<userTask id="approve" name="批准合并" coda:assignee="user" coda:handback="false" coda:status="评审通过:等你批准合并">
|
|
287
|
+
<documentation>PR #{{github.event.number}} 可以合并。
|
|
283
288
|
|
|
284
289
|
- **评审**:{{review.line}}
|
|
285
290
|
- **改动**:{{review.files}}
|
|
@@ -290,94 +295,110 @@ GitHub 上各项检查用 `gh pr checks {{github.event.pull_request.html_url}}`
|
|
|
290
295
|
{{review.report}}
|
|
291
296
|
|
|
292
297
|
「合并」以 {{vars.review.mergeMethod}} 方式合并提交 {{reviewing.head}}{{if kinds.premerge then ",先在它上面跑项目的合并前检查,都通过才合并" else ""}}。没合并成(合并前检查没通过,或 GitHub 没合并:冲突、检查没过等)就交给开 PR 的会话处理,它推送的新版本评审通过后按这次的选择合并,不再问你;评审要求修改则这次批准作废。</documentation>
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
298
|
+
<extensionElements>
|
|
299
|
+
<coda:choice id="merge" name="合并" primary="true">
|
|
300
|
+
<coda:option default='=list contains(vars.review.mergeOptions, "deleteBranch")' id="deleteBranch" name="合并后删除远程分支" detail="删除这个 PR 的远程源分支,本地分支和工作树保留" />
|
|
301
|
+
<coda:option default='=list contains(vars.review.mergeOptions, "deploy")' id="deploy" name="部署" detail="调用项目里的部署流程" coda:shown="=kinds.deploy" />
|
|
302
|
+
<coda:option default='=list contains(vars.review.mergeOptions, "preview")' id="preview" name="发布预览版" detail="调用项目里的预览发布流程" coda:shown="=kinds.preview" />
|
|
303
|
+
<coda:option default='=list contains(vars.review.mergeOptions, "release")' id="release" name="发布正式版" detail="调用项目里的正式发布流程" coda:shown="=kinds.release" />
|
|
304
|
+
<coda:option default='=list contains(vars.review.mergeOptions, "notify")' id="notify" name="全部完成后通知 Agent" detail="合并及所选删除分支、部署、发布结束后通知" />
|
|
305
|
+
</coda:choice>
|
|
306
|
+
<coda:choice id="send" name="让 Agent 处理评审意见" />
|
|
307
|
+
<coda:choice id="close" name="关闭 PR" detail="不合并,在 GitHub 上关闭这个 PR" />
|
|
308
|
+
</extensionElements>
|
|
309
|
+
</userTask>
|
|
310
|
+
<sequenceFlow id="to-how" sourceRef="approve" targetRef="how" />
|
|
311
|
+
<exclusiveGateway id="how" name="合并还是关闭" default="merge-it" />
|
|
312
|
+
<sequenceFlow id="close-it" sourceRef="how" targetRef="preparing-close">
|
|
313
|
+
<conditionExpression xsi:type="tFormalExpression">=approve.chose.close</conditionExpression>
|
|
314
|
+
</sequenceFlow>
|
|
315
|
+
<sequenceFlow id="send-it" sourceRef="how" targetRef="handed">
|
|
316
|
+
<conditionExpression xsi:type="tFormalExpression">=approve.chose.send</conditionExpression>
|
|
317
|
+
</sequenceFlow>
|
|
318
|
+
<sequenceFlow id="merge-it" sourceRef="how" targetRef="approval" />
|
|
319
|
+
|
|
320
|
+
<userTask id="handed" name="处理你交付的评审意见" coda:status="处理你交付的评审意见" coda:completeLabel="已处理并推送" coda:rejectLabel="无法处理">
|
|
321
|
+
<documentation>用户要求处理 PR #{{github.event.number}} 的这份评审(提交 {{review.head}}):
|
|
317
322
|
|
|
318
323
|
{{review.report}}
|
|
319
324
|
|
|
320
325
|
补充要求:{{approve.note}}
|
|
321
326
|
|
|
322
327
|
请先核实意见在当前版本是否仍成立,再修改、验证并推送,然后答复 completed;新版本会重新评审,再请用户批准。做不了就答复 rejected。</documentation>
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
328
|
+
</userTask>
|
|
329
|
+
<sequenceFlow id="handled" sourceRef="handed" targetRef="preparing-fixing" />
|
|
330
|
+
<boundaryEvent id="not-handled" name="做不了" attachedToRef="handed"><errorEventDefinition /></boundaryEvent>
|
|
331
|
+
<sequenceFlow id="back-to-approve" sourceRef="not-handled" targetRef="approve" />
|
|
332
|
+
|
|
333
|
+
<!-- 记下你批准的时刻和合并后要做的事:之后评审再要求修改(review.changesAt 更晚)这次批准才作废;
|
|
334
|
+
合并后的删分支、部署、发布与通知都照这里,不论 Coda 先从合并步骤还是先从 GitHub 得知合并了。 -->
|
|
335
|
+
<scriptTask id="approval" name="记下批准" coda:timeout="5" coda:checkout="false" scriptFormat="bash">
|
|
336
|
+
<extensionElements>
|
|
337
|
+
<coda:env name="APPROVED" value="=approve" />
|
|
338
|
+
<coda:output name="at" />
|
|
339
|
+
<coda:output name="deleteBranch" />
|
|
340
|
+
<coda:output name="deploy" />
|
|
341
|
+
<coda:output name="release" />
|
|
342
|
+
<coda:output name="releaseKinds" />
|
|
343
|
+
<coda:output name="notify" />
|
|
344
|
+
<coda:output name="what" />
|
|
345
|
+
</extensionElements>
|
|
346
|
+
<script>node "${CODA_PLUGIN_PATH}/scripts/approval.mjs"</script>
|
|
347
|
+
</scriptTask>
|
|
348
|
+
<sequenceFlow id="to-premerge" sourceRef="approval" targetRef="premerge" />
|
|
349
|
+
|
|
350
|
+
<!-- 合并前检查:每个版本都跑嫌贵的验证(如后端全套),项目声明为 coda:kind="premerge",批准后在要合并的提交上只跑一次。
|
|
351
|
+
没通过交给开 PR 的会话:推新提交就从头再来,评审通过后按原批准合并;检查本身出了问题,处理好后答复,再跑一遍。 -->
|
|
352
|
+
<serviceTask id="premerge" name="合并前检查" coda:action="run-workflows" coda:status="合并前检查">
|
|
353
|
+
<extensionElements>
|
|
354
|
+
<coda:param name="kind" value="premerge" />
|
|
355
|
+
<coda:param name="commit" value="=reviewing.head" />
|
|
356
|
+
</extensionElements>
|
|
357
|
+
</serviceTask>
|
|
358
|
+
<sequenceFlow id="premerged" sourceRef="premerge" targetRef="handing" />
|
|
359
|
+
<!-- 记下交给 GitHub 的是哪个提交:合并期间送到的关闭,合进去的是它才是这条运行交出去的合并(「是批准的合并吗」)。
|
|
360
|
+
合并前检查没过、还在等人处理时,这一步没跑过。 -->
|
|
361
|
+
<scriptTask id="handing" name="交给 GitHub" coda:timeout="5" coda:checkout="false" scriptFormat="bash">
|
|
362
|
+
<extensionElements>
|
|
363
|
+
<coda:env name="HEAD" value="=reviewing.head" />
|
|
364
|
+
<coda:output name="head" />
|
|
365
|
+
</extensionElements>
|
|
366
|
+
<script>echo "head=$HEAD" >> "$GITHUB_OUTPUT"</script>
|
|
367
|
+
</scriptTask>
|
|
368
|
+
<sequenceFlow id="handed-over" sourceRef="handing" targetRef="preparing-ready" />
|
|
369
|
+
<boundaryEvent id="premerge-broke" name="没通过" attachedToRef="premerge"><errorEventDefinition /></boundaryEvent>
|
|
370
|
+
<sequenceFlow id="premerge-to-fix" sourceRef="premerge-broke" targetRef="fix-premerge" />
|
|
371
|
+
<userTask id="fix-premerge" name="合并前检查没通过:处理后答复" coda:status="合并前检查没通过:开 PR 的会话处理中" coda:completeLabel="已处理,再跑检查" coda:rejectLabel="处理不了">
|
|
372
|
+
<documentation>用户已批准合并 PR #{{github.event.number}}({{github.event.pull_request.html_url}}),但提交 {{reviewing.head}} 的合并前检查没通过,还没有合并。没通过的检查列在这次运行页的「调用的流程」里(运行 {{run.id}})。
|
|
368
373
|
|
|
369
374
|
请查明原因。是这次改动导致的就修改、验证并推送新版本(新版本会重新检查、评审,通过后按用户的批准合并),不必答复这个任务;检查本身出了问题(偶发、机器离线),处理好后答复 completed,合并前检查会再跑一遍。做不了就答复 rejected,在 note 里写明原因,交给用户。</documentation>
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
375
|
+
</userTask>
|
|
376
|
+
<sequenceFlow id="premerge-again" sourceRef="fix-premerge" targetRef="premerge" />
|
|
377
|
+
<boundaryEvent id="premerge-stuck" name="做不了" attachedToRef="fix-premerge"><errorEventDefinition /></boundaryEvent>
|
|
378
|
+
<sequenceFlow id="to-premerge-user" sourceRef="premerge-stuck" targetRef="premerge-user" />
|
|
379
|
+
<userTask id="premerge-user" name="合并前检查没通过:等你处理" coda:assignee="user" coda:handback="false" coda:status="合并前检查没通过:等你处理" coda:completeLabel="再跑检查" coda:rejectLabel="不再等">
|
|
380
|
+
<documentation>你已批准合并 PR #{{github.event.number}}({{github.event.pull_request.html_url}}),但合并前检查没通过,开 PR 的会话处理不了,理由在这次运行的「合并前检查没通过:处理后答复」任务里;
|
|
376
381
|
没通过的检查见运行页「调用的流程」。
|
|
377
382
|
|
|
378
383
|
处理好后选「再跑检查」;推送新提交也会从头再来。</documentation>
|
|
379
|
-
|
|
380
|
-
|
|
384
|
+
</userTask>
|
|
385
|
+
<sequenceFlow id="premerge-again-by-user" sourceRef="premerge-user" targetRef="premerge" />
|
|
386
|
+
|
|
387
|
+
<endEvent id="preparing-ready"><extensionElements><coda:output name="outcome" value="merge" /></extensionElements></endEvent>
|
|
388
|
+
<endEvent id="preparing-close"><extensionElements><coda:output name="outcome" value="close" /></extensionElements></endEvent>
|
|
389
|
+
<endEvent id="preparing-fixing"><extensionElements><coda:output name="outcome" value="fixing" /></extensionElements></endEvent>
|
|
390
|
+
</subProcess>
|
|
391
|
+
<boundaryEvent id="closed-while-preparing" name="PR 关闭" attachedToRef="preparing"><messageEventDefinition messageRef="closed" /></boundaryEvent>
|
|
392
|
+
<sequenceFlow id="preparing-ended" sourceRef="closed-while-preparing" targetRef="merging-elsewhere" />
|
|
393
|
+
<sequenceFlow id="prepared" sourceRef="preparing" targetRef="after-preparing" />
|
|
394
|
+
<exclusiveGateway id="after-preparing" name="按批准执行" default="prepared-merge" />
|
|
395
|
+
<sequenceFlow id="prepared-close" sourceRef="after-preparing" targetRef="close">
|
|
396
|
+
<conditionExpression xsi:type="tFormalExpression">=preparing.outcome = "close"</conditionExpression>
|
|
397
|
+
</sequenceFlow>
|
|
398
|
+
<sequenceFlow id="prepared-fixing" sourceRef="after-preparing" targetRef="merging-fixing">
|
|
399
|
+
<conditionExpression xsi:type="tFormalExpression">=preparing.outcome = "fixing"</conditionExpression>
|
|
400
|
+
</sequenceFlow>
|
|
401
|
+
<sequenceFlow id="prepared-merge" sourceRef="after-preparing" targetRef="merge" />
|
|
381
402
|
|
|
382
403
|
<scriptTask id="close" name="关闭 PR" coda:timeout="5" coda:checkout="false" scriptFormat="bash">
|
|
383
404
|
<extensionElements><coda:env name="URL" value="=github.event.pull_request.html_url" /></extensionElements>
|
|
@@ -399,39 +420,55 @@ GitHub 上各项检查用 `gh pr checks {{github.event.pull_request.html_url}}`
|
|
|
399
420
|
</scriptTask>
|
|
400
421
|
<sequenceFlow id="to-result" sourceRef="merge" targetRef="result" />
|
|
401
422
|
<exclusiveGateway id="result" name="合并了吗" default="handed-to-github" />
|
|
402
|
-
<sequenceFlow id="refused" sourceRef="result" targetRef="
|
|
423
|
+
<sequenceFlow id="refused" sourceRef="result" targetRef="resolving">
|
|
403
424
|
<conditionExpression xsi:type="tFormalExpression">=merge.refused</conditionExpression>
|
|
404
425
|
</sequenceFlow>
|
|
405
426
|
<sequenceFlow id="handed-to-github" sourceRef="result" targetRef="merging-merged" />
|
|
406
427
|
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
<
|
|
428
|
+
<subProcess id="resolving" name="处理合并阻碍">
|
|
429
|
+
<startEvent id="resolving-in" />
|
|
430
|
+
<sequenceFlow id="resolving-started" sourceRef="resolving-in" targetRef="unblock" />
|
|
431
|
+
<!-- 没有合并:开 PR 的会话推新提交(经评审后按原批准合并),或处理好之后答复重试;它做不了交给你。 -->
|
|
432
|
+
<userTask id="unblock" name="合并没成功:处理后答复" coda:status="没有合并:开 PR 的会话处理中" coda:completeLabel="已处理,重试合并" coda:rejectLabel="处理不了">
|
|
433
|
+
<documentation>用户已批准合并 PR #{{github.event.number}}({{github.event.pull_request.html_url}}),但没有合并:{{merge.reason}}
|
|
410
434
|
|
|
411
435
|
- 与目标分支 {{github.event.pull_request.base.ref}} 有冲突,或要求先合入:把它合入这个 PR 的分支,解决冲突、验证并推送。新提交照常评审,通过后按用户的批准合并,不必答复这个任务。
|
|
412
436
|
- PR 是草稿:确认可以评审后用 `gh pr ready` 标记,再答复 completed 重试合并。
|
|
413
437
|
- 必需的检查还没通过:等它通过后答复 completed 重试;检查失败就修复并推送。
|
|
414
438
|
|
|
415
439
|
做不了就答复 rejected,在 note 里写明原因,交给用户。</documentation>
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
440
|
+
</userTask>
|
|
441
|
+
<sequenceFlow id="retry" sourceRef="unblock" targetRef="resolving-retry" />
|
|
442
|
+
<boundaryEvent id="stuck" name="做不了" attachedToRef="unblock"><errorEventDefinition /></boundaryEvent>
|
|
443
|
+
<sequenceFlow id="to-unblock-user" sourceRef="stuck" targetRef="unblock-user" />
|
|
444
|
+
<userTask id="unblock-user" name="合并没成功:等你处理" coda:assignee="user" coda:handback="false" coda:status="没有合并:等你处理">
|
|
445
|
+
<documentation>你已批准合并 PR #{{github.event.number}}({{github.event.pull_request.html_url}}),但没有合并:{{merge.reason}}
|
|
422
446
|
|
|
423
447
|
开 PR 的会话处理不了,理由在这次运行的「合并没成功:处理后答复」任务里。在 GitHub 上处理好后选「重试合并」;推送新提交也会接着评审、按你的批准合并。</documentation>
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
448
|
+
<extensionElements>
|
|
449
|
+
<coda:choice id="retry" name="重试合并" primary="true" />
|
|
450
|
+
<coda:choice id="close" name="关闭 PR" detail="不合并,在 GitHub 上关闭这个 PR" />
|
|
451
|
+
</extensionElements>
|
|
452
|
+
</userTask>
|
|
453
|
+
<sequenceFlow id="to-user-how" sourceRef="unblock-user" targetRef="user-how" />
|
|
454
|
+
<exclusiveGateway id="user-how" name="重试还是关闭" default="retry-by-user" />
|
|
455
|
+
<sequenceFlow id="close-by-user" sourceRef="user-how" targetRef="resolving-close">
|
|
456
|
+
<conditionExpression xsi:type="tFormalExpression">=unblock-user.chose.close</conditionExpression>
|
|
457
|
+
</sequenceFlow>
|
|
458
|
+
<sequenceFlow id="retry-by-user" sourceRef="user-how" targetRef="resolving-retry" />
|
|
459
|
+
|
|
460
|
+
<endEvent id="resolving-retry"><extensionElements><coda:output name="outcome" value="retry" /></extensionElements></endEvent>
|
|
461
|
+
<endEvent id="resolving-close"><extensionElements><coda:output name="outcome" value="close" /></extensionElements></endEvent>
|
|
462
|
+
</subProcess>
|
|
463
|
+
<boundaryEvent id="closed-while-resolving" name="PR 关闭" attachedToRef="resolving"><messageEventDefinition messageRef="closed" /></boundaryEvent>
|
|
464
|
+
<sequenceFlow id="resolving-ended" sourceRef="closed-while-resolving" targetRef="merging-elsewhere" />
|
|
465
|
+
<sequenceFlow id="resolved" sourceRef="resolving" targetRef="after-resolving" />
|
|
466
|
+
<exclusiveGateway id="after-resolving" name="重试还是关闭" default="resolved-retry" />
|
|
467
|
+
<sequenceFlow id="resolved-close" sourceRef="after-resolving" targetRef="close">
|
|
468
|
+
<conditionExpression xsi:type="tFormalExpression">=resolving.outcome = "close"</conditionExpression>
|
|
433
469
|
</sequenceFlow>
|
|
434
|
-
<sequenceFlow id="retry
|
|
470
|
+
<sequenceFlow id="resolved-retry" sourceRef="after-resolving" targetRef="merge" />
|
|
471
|
+
<endEvent id="merging-elsewhere"><extensionElements><coda:output name="outcome" value="elsewhere" /></extensionElements></endEvent>
|
|
435
472
|
|
|
436
473
|
<endEvent id="merging-merged" name="交给 GitHub 了"><extensionElements><coda:output name="outcome" value="merged" /></extensionElements></endEvent>
|
|
437
474
|
<endEvent id="merging-fixing" name="等修改"><extensionElements><coda:output name="outcome" value="fixing" /></extensionElements></endEvent>
|
|
@@ -442,10 +479,7 @@ GitHub 上各项检查用 `gh pr checks {{github.event.pull_request.html_url}}`
|
|
|
442
479
|
<!-- 等你批准或等会话处理时 base 被改了:改动跟着变了,从头再看,重新评审,「看 base」重新判断叠放。 -->
|
|
443
480
|
<boundaryEvent id="rebased-while-merging" name="base 变了" attachedToRef="merging"><messageEventDefinition messageRef="edited" /></boundaryEvent>
|
|
444
481
|
<sequenceFlow id="merging-rebased" sourceRef="rebased-while-merging" targetRef="opening" />
|
|
445
|
-
|
|
446
|
-
<sequenceFlow id="merging-ended" sourceRef="closed-while-merging" targetRef="approved-merged" />
|
|
447
|
-
<!-- 合并步骤把 PR 交给 GitHub 后,GitHub 的关闭可能先于这一步结束送到:合进去的正是「交给 GitHub」记下的那个提交,
|
|
448
|
-
就是你批准、也过了合并前检查的合并,照你的选择接着删分支、部署、发布;否则是别处合并或关闭的。 -->
|
|
482
|
+
<!-- 等待人工处理时收到合并确认:核对交给 GitHub 的提交,照原批准继续;尚未交出去的是别处合并。 -->
|
|
449
483
|
<exclusiveGateway id="approved-merged" name="是批准的合并吗" default="not-approved" />
|
|
450
484
|
<sequenceFlow id="as-approved-merged" sourceRef="approved-merged" targetRef="deleting-or-not">
|
|
451
485
|
<conditionExpression xsi:type="tFormalExpression">=github.event.pull_request.merged and github.event.pull_request.head.sha = handing.head</conditionExpression>
|
|
@@ -453,6 +487,9 @@ GitHub 上各项检查用 `gh pr checks {{github.event.pull_request.html_url}}`
|
|
|
453
487
|
<sequenceFlow id="not-approved" sourceRef="approved-merged" targetRef="ended" />
|
|
454
488
|
<sequenceFlow id="to-after-merging" sourceRef="merging" targetRef="after-merging" />
|
|
455
489
|
<exclusiveGateway id="after-merging" name="接下来" default="to-confirming" />
|
|
490
|
+
<sequenceFlow id="merging-ended" sourceRef="after-merging" targetRef="approved-merged">
|
|
491
|
+
<conditionExpression xsi:type="tFormalExpression">=merging.outcome = "elsewhere"</conditionExpression>
|
|
492
|
+
</sequenceFlow>
|
|
456
493
|
<sequenceFlow id="merged-to-waiting" sourceRef="after-merging" targetRef="waiting">
|
|
457
494
|
<conditionExpression xsi:type="tFormalExpression">=merging.outcome = "fixing"</conditionExpression>
|
|
458
495
|
</sequenceFlow>
|
package/README.md
CHANGED
|
@@ -95,7 +95,9 @@ prompts/principles/ 评审重点,一项一段,按设置取
|
|
|
95
95
|
- 批准在评审再要求修改时作废:「交叉评审」逐次接力输出最近一次要求修改的时刻 `changesAt`,「记下批准」输出你批准的时刻 `at`,
|
|
96
96
|
「按原批准合并吗」只在 `at` 晚于 `changesAt` 时不再问你。
|
|
97
97
|
- 交给 GitHub 后在「等 GitHub 确认」等关闭事件,它带来合并提交;期间有新提交(被移出了合并队列)就从头再来。
|
|
98
|
-
|
|
98
|
+
我们发起的合并、关闭命令正常收尾;它们产生的关闭事件先到时留在收件箱,不打断命令,也不把合并阶段记为取消。
|
|
99
|
+
合并命令结束后再读取确认,照你的勾选接着做。等待批准、合并前检查或人工处理时收到关闭,仍立即结束相应等待。
|
|
100
|
+
合并前,「交给 GitHub」记下要交出去的提交;合并受阻、等人处理时才收到这个提交的合并确认,仍照原批准继续。
|
|
99
101
|
合并前检查没过、还在等人处理时被别处合并,不算这条运行的合并。
|
|
100
102
|
- 勾选「合并后删除远程分支」时,确认合并后、部署与发布前运行「删除远程分支」(`delete-branch.mjs`)。它从 PR 读取源仓库(包括 fork)与源分支,
|
|
101
103
|
只删除仍指向这次批准合并的提交的远程分支;本地分支与会话工作树保留。分支或源仓库已删除就跳过,有了其他提交、是默认分支或合并目标分支则保留,原因记在步骤摘要。
|
package/package.json
CHANGED
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
"name": "@coda-console/review",
|
|
3
3
|
"id": "review",
|
|
4
4
|
"displayName": "PR 生命流程",
|
|
5
|
-
"description": "
|
|
6
|
-
"
|
|
5
|
+
"description": "PR 从检查、评审到批准合并",
|
|
6
|
+
"icon": { "symbol": "checkmark.bubble.fill", "color": "purple" },
|
|
7
|
+
"version": "2.10.0",
|
|
7
8
|
"categories": [
|
|
8
9
|
"工作流程"
|
|
9
10
|
],
|