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

Enable testing merge queues @ GitHub Actions CI/CD #1990

Merged
merged 1 commit into from
Sep 21, 2023

Conversation

webknjaz
Copy link
Member

This patch allows the project to start using merge queues. They will still have to be enabled in the branch protection settings.

Contributor checklist
  • Included tests for the changes.
  • PR title is short, clear, and ready to be included in the user-facing changelog.
Maintainer checklist
  • Verified one of these labels is present: backwards incompatible, feature, enhancement, deprecation, bug, dependency, docs or skip-changelog as they determine changelog listing.
  • Assign the PR to an existing or new milestone for the target version (following Semantic Versioning).

@webknjaz webknjaz added maintenance Related to maintenance processes ci Related to continuous integration tasks skip-changelog Avoid listing in changelog labels Sep 21, 2023
@webknjaz
Copy link
Member Author

Hey @jezdez, could you go to the repo's branch protection settings, and enable merge queues there, once this PR is merged?

Copy link
Contributor

@chrysle chrysle left a comment

Choose a reason for hiding this comment

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

Interesting! I've seen this over at PyPUG.

@chrysle chrysle merged commit b3fd30e into jazzband:main Sep 21, 2023
36 checks passed
@jezdez
Copy link
Member

jezdez commented Sep 21, 2023

@webknjaz done, using squash commits

@jezdez
Copy link
Member

jezdez commented Sep 21, 2023

CleanShot 2023-09-21 at 12 36 20@2x

@webknjaz
Copy link
Member Author

@webknjaz done, using squash commits

@jezdez please, keep all the options. Squashing is harmful for history.

@jezdez
Copy link
Member

jezdez commented Sep 21, 2023

@webknjaz It's not a multiple choice config, here are the options:

CleanShot 2023-09-21 at 13 41 38@2x

@webknjaz
Copy link
Member Author

@jezdez then, use merge. It'll make them octopus. Also, I'd drop that checkbox for "only failing" — sometimes, several failing PRs composed will result in a green CI.

@jezdez
Copy link
Member

jezdez commented Sep 21, 2023

@webknjaz 👍🏻

@webknjaz
Copy link
Member Author

@jezdez thanks! This will help reduce the need for people to "merge main into PR" all the time since the merge queue will take care of checking that several PRs play well together.

@chrysle
Copy link
Contributor

chrysle commented Sep 29, 2023

@webknjaz CI seems to have started failing after this pull request. Could you look into this?

@webknjaz
Copy link
Member Author

That's unrelated. The scheduled nightly runs have a slightly different CI matrix which includes testing against the very last commit in the Pip's repository — that's what's failing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci Related to continuous integration tasks maintenance Related to maintenance processes skip-changelog Avoid listing in changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants