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

Add a CI status check to prevent merging PRs that contain merges #4308

Merged
merged 1 commit into from
Apr 30, 2024

Conversation

neilmayhew
Copy link
Contributor

Closes #4307

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated
  • When applicable, versions are updated in .cabal and CHANGELOG.md files according to the
    versioning process.
  • The version bounds in .cabal files for all affected packages are updated. If you change the bounds in a cabal file, that package itself must have a version increase. (See RELEASING.md)
  • All visible changes are prepended to the latest section of a CHANGELOG.md for the affected packages. New section is never added with the code changes. (See RELEASING.md)
  • Code is formatted with fourmolu (use scripts/fourmolize.sh)
  • Cabal files are formatted (use scripts/cabal-format.sh)
  • hie.yaml has been updated (use scripts/gen-hie.sh)
  • Self-reviewed the diff

@neilmayhew neilmayhew requested a review from lehins April 29, 2024 22:13
Copy link
Contributor

@lehins lehins left a comment

Choose a reason for hiding this comment

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

Awesome! Thank you!

Copy link
Contributor

@lehins lehins left a comment

Choose a reason for hiding this comment

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

@neilmayhew neilmayhew force-pushed the neilmayhew/4307-ci-check-branch-history branch 3 times, most recently from c6e34b5 to 9a5b7f2 Compare April 29, 2024 23:44
@neilmayhew
Copy link
Contributor Author

This seems to be working now. It failed (for the right reasons!) on the last run when there was still a merge commit on the branch. If it passes this time, it should be good to go.

@neilmayhew neilmayhew requested a review from lehins April 29, 2024 23:47
Copy link
Contributor

@lehins lehins left a comment

Choose a reason for hiding this comment

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

Perfect!

@lehins lehins force-pushed the neilmayhew/4307-ci-check-branch-history branch from 9a5b7f2 to 2ff6b97 Compare April 30, 2024 03:49
@lehins lehins enabled auto-merge April 30, 2024 03:49
@lehins lehins merged commit 42d5b6d into master Apr 30, 2024
125 checks passed
@lehins lehins deleted the neilmayhew/4307-ci-check-branch-history branch April 30, 2024 05:19
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.

Add a CI status check to prevent merging PRs that already have merges in them
2 participants