Skip to content

Commit 8a354df

Browse files
authored
chore(ci): address two minor workflow issues (#438)
Quick fixes for two small issues: - the `cancel-in-progress: true` on the automerge and auto-approve workflows was sometimes (not consistently) causing _all_ runs of a workflow to be canceled, instead of forcing only the most recent one to run. This feels like a bug on GitHub's side but whatever, we should be able to fix it by removing that setting. - for whatever reason the alert-open-prs workflow has been failing a lot this week with 503s/504s, which shows up as red on our dashboard. If this workflow happens to fail once, it's not that big of a deal, so I applied the same fix that we used for the lock workflow -- `continue-on-error: true` to have the workflow not show up as failed.
1 parent cf39584 commit 8a354df

File tree

6 files changed

+5
-14
lines changed

6 files changed

+5
-14
lines changed

.github/workflows/auto-approve.yml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/automerge.yml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/alert-open-prs.ts

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ export class AlertOpenPrs {
7171
env: { SLACK_WEBHOOK_URL: slackWebhookUrl },
7272
},
7373
],
74+
continueOnError: true, // this job fails sometimes due to Slack timeouts (503s and 504s) but it's really not a big deal if it does
7475
});
7576
}
7677
}

src/auto-approve.ts

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export class AutoApprove {
2323

2424
(workflow.concurrency as any) = {
2525
group: "${{ github.workflow }}-${{ github.head_ref }}",
26-
cancelInProgress: true,
2726
};
2827

2928
const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`;

src/automerge.ts

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export class Automerge {
2929

3030
(workflow.concurrency as any) = {
3131
group: "${{ github.workflow }}-${{ github.head_ref }}",
32-
cancelInProgress: true,
3332
};
3433

3534
const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`;

test/__snapshots__/index.test.ts.snap

+4-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)