Skip to content

Commit

Permalink
chore(ci): address two minor workflow issues (#438)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
xiehan authored Aug 14, 2024
1 parent cf39584 commit 8a354df
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 14 deletions.
1 change: 0 additions & 1 deletion .github/workflows/auto-approve.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .github/workflows/automerge.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/alert-open-prs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export class AlertOpenPrs {
env: { SLACK_WEBHOOK_URL: slackWebhookUrl },
},
],
continueOnError: true, // this job fails sometimes due to Slack timeouts (503s and 504s) but it's really not a big deal if it does
});
}
}
1 change: 0 additions & 1 deletion src/auto-approve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export class AutoApprove {

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

const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`;
Expand Down
1 change: 0 additions & 1 deletion src/automerge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export class Automerge {

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

const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`;
Expand Down
14 changes: 4 additions & 10 deletions test/__snapshots__/index.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8a354df

Please sign in to comment.