@@ -216,36 +216,6 @@ jobs:
216216 });
217217 const wasTrusted = currentLabels.some((label) => label.name === "vouch:trusted");
218218
219- for (const label of currentLabels) {
220- if (!managedLabelNames.has(label.name) || label.name === nextLabelName) {
221- continue;
222- }
223-
224- try {
225- await github.rest.issues.removeLabel({
226- owner: context.repo.owner,
227- repo: context.repo.repo,
228- issue_number: issueNumber,
229- name: label.name,
230- });
231- } catch (removeError) {
232- if (removeError.status !== 404) {
233- throw removeError;
234- }
235- }
236- }
237-
238- if (!currentLabels.some((label) => label.name === nextLabelName)) {
239- await github.rest.issues.addLabels({
240- owner: context.repo.owner,
241- repo: context.repo.repo,
242- issue_number: issueNumber,
243- labels: [nextLabelName],
244- });
245- }
246-
247- core.info(`PR #${issueNumber}: ${status} -> ${nextLabelName}`);
248-
249219 const { data: pull } = await github.rest.pulls.get({
250220 owner: context.repo.owner,
251221 repo: context.repo.repo,
@@ -276,13 +246,44 @@ jobs:
276246
277247 if (!decision.trigger) {
278248 core.info(`PR #${issueNumber}: skipped Bugbot because ${decision.reason}`);
279- return;
249+ } else {
250+ const { data: comment } = await github.rest.issues.createComment({
251+ owner: context.repo.owner,
252+ repo: context.repo.repo,
253+ issue_number: issueNumber,
254+ body: renderBugbotRequest(pull.head.sha),
255+ });
256+ core.info(`PR #${issueNumber}: requested Bugbot at ${comment.html_url}`);
280257 }
281258
282- const { data: comment } = await github.rest.issues.createComment({
283- owner: context.repo.owner,
284- repo: context.repo.repo,
285- issue_number: issueNumber,
286- body: renderBugbotRequest(pull.head.sha),
287- });
288- core.info(`PR #${issueNumber}: requested Bugbot at ${comment.html_url}`);
259+ // Keep the old trust label until a required Bugbot request is recorded.
260+ // A later bulk Vouch sync can then retry if comment creation fails.
261+ for (const label of currentLabels) {
262+ if (!managedLabelNames.has(label.name) || label.name === nextLabelName) {
263+ continue;
264+ }
265+
266+ try {
267+ await github.rest.issues.removeLabel({
268+ owner: context.repo.owner,
269+ repo: context.repo.repo,
270+ issue_number: issueNumber,
271+ name: label.name,
272+ });
273+ } catch (removeError) {
274+ if (removeError.status !== 404) {
275+ throw removeError;
276+ }
277+ }
278+ }
279+
280+ if (!currentLabels.some((label) => label.name === nextLabelName)) {
281+ await github.rest.issues.addLabels({
282+ owner: context.repo.owner,
283+ repo: context.repo.repo,
284+ issue_number: issueNumber,
285+ labels: [nextLabelName],
286+ });
287+ }
288+
289+ core.info(`PR #${issueNumber}: ${status} -> ${nextLabelName}`);
0 commit comments