Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge group cancelling issue #4957

Merged
merged 1 commit into from
Mar 10, 2023

Conversation

newhoggy
Copy link
Contributor

@newhoggy newhoggy commented Mar 8, 2023

When more than one PR gets added the the merge queue, the earlier ones might cancel due to our concurrency policy. This is to prevent that.

See https://github.com/orgs/community/discussions/46757?sort=top#discussioncomment-4980818

@newhoggy newhoggy force-pushed the newhoggy/fix-merge-group-cancelling-issue branch from ba236aa to 11040ff Compare March 8, 2023 22:52
@newhoggy newhoggy marked this pull request as ready for review March 8, 2023 23:23
@newhoggy newhoggy requested review from Jimbo4350 and a team as code owners March 8, 2023 23:23
@newhoggy newhoggy requested review from angerman and erikd March 8, 2023 23:24
@newhoggy newhoggy added this pull request to the merge queue Mar 8, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 8, 2023
@angerman angerman added this pull request to the merge queue Mar 9, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 9, 2023
@angerman
Copy link
Contributor

angerman commented Mar 9, 2023

@newhoggy please make sure to keep notes about this in the knowledge base doc on merge queues.

Under "common complications" with an analysis and solution. This won't be the last time we encounter this 😅

Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add comments to the changes otherwise it's difficult to discern why we have named the concurrency groups this way. The link to the github comment would also be useful in the comments.

.github/workflows/check-cabal-files.yml Show resolved Hide resolved
@angerman
Copy link
Contributor

angerman commented Mar 9, 2023

The fact that we have to replicate this over so many files is a bit ... dissatisfying, it feels like this is going to easily lead to divergence? Do we need a GHA linter?

@newhoggy newhoggy force-pushed the newhoggy/fix-merge-group-cancelling-issue branch from 11040ff to 96c11be Compare March 9, 2023 12:24
@newhoggy newhoggy requested a review from Jimbo4350 March 9, 2023 12:24
@Jimbo4350 Jimbo4350 added this pull request to the merge queue Mar 9, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 9, 2023
@Jimbo4350 Jimbo4350 added this pull request to the merge queue Mar 9, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 9, 2023
@newhoggy newhoggy added this pull request to the merge queue Mar 9, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 9, 2023
@angerman
Copy link
Contributor

angerman commented Mar 9, 2023

🙈 the replication everywhere. But let's fix that in a different Pr and get this merged to prevent unnecessary merge queue cancellations.

@angerman angerman added this pull request to the merge queue Mar 9, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 9, 2023
@newhoggy newhoggy merged commit a73227c into master Mar 10, 2023
@iohk-bors iohk-bors bot deleted the newhoggy/fix-merge-group-cancelling-issue branch March 10, 2023 00:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants