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 experimental mergify configuration #1281

Merged
merged 5 commits into from Oct 19, 2022
Merged

Add experimental mergify configuration #1281

merged 5 commits into from Oct 19, 2022

Conversation

AlekSi
Copy link
Member

@AlekSi AlekSi commented Oct 19, 2022

Description

See https://mergify.com and https://docs.mergify.com/configuration/

That configuration should remove the need to constantly click the "Update branch" button.

It probably will be replaced by a GitHub-native merge queue (https://github.com/features/merge-queue/signup) when we get access to it.

Readiness checklist

  • I added tests for new functionality or bugfixes.
  • I ran task all, and it passed.
  • I added/updated comments for both exported and unexported top-level declarations (functions, types, etc).
  • I checked comments rendering with task godocs.
  • I ensured that the title is good enough for the changelog.
  • (for maintainers only) I set Reviewers (@FerretDB/core), Assignee, Labels, Project and project's Sprint fields.
  • I marked all done items in this checklist.

See https://mergify.com
and https://docs.mergify.com/configuration/

That configuration should remove the need to constantly click the "Update branch" button.

It probably will be replaced by a GitHub-native merge queue
(https://github.com/features/merge-queue/signup)
when we get access to it.
@AlekSi AlekSi added the code/chore Code maintenance improvements label Oct 19, 2022
@AlekSi AlekSi added this to the v0.6.0 Alpha milestone Oct 19, 2022
@AlekSi AlekSi self-assigned this Oct 19, 2022
@vercel
Copy link

vercel bot commented Oct 19, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
ferret-db ✅ Ready (Inspect) Visit Preview Oct 19, 2022 at 8:59AM (UTC)

@AlekSi AlekSi requested review from a team, w84thesun, rumyantseva, chilagrow and noisersup and removed request for a team October 19, 2022 04:42
@AlekSi AlekSi enabled auto-merge (squash) October 19, 2022 04:43
@vercel vercel bot temporarily deployed to Preview October 19, 2022 04:45 Inactive
@codecov
Copy link

codecov bot commented Oct 19, 2022

Codecov Report

Merging #1281 (7223b54) into main (0c29ff7) will decrease coverage by 0.02%.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1281      +/-   ##
==========================================
- Coverage   67.12%   67.10%   -0.03%     
==========================================
  Files         270      270              
  Lines       12722    12722              
==========================================
- Hits         8540     8537       -3     
- Misses       3275     3277       +2     
- Partials      907      908       +1     
Impacted Files Coverage Δ
internal/util/version/version.go 48.52% <0.00%> (-4.42%) ⬇️
internal/handlers/common/filter.go 86.58% <0.00%> (ø)
Flag Coverage Δ
integration 63.01% <ø> (-0.03%) ⬇️
mongodb 14.09% <ø> (-0.01%) ⬇️
pg 52.42% <ø> (-0.03%) ⬇️
tigris 34.06% <ø> (-0.03%) ⬇️
unit 25.05% <ø> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@vercel vercel bot temporarily deployed to Preview October 19, 2022 04:59 Inactive
@vercel vercel bot temporarily deployed to Preview October 19, 2022 05:05 Inactive
Copy link
Member

@rumyantseva rumyantseva left a comment

Choose a reason for hiding this comment

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

The configuration looks strange to me - are the conditions "or" conditions or "and" conditions? It's not straightforward from the docs, but if you checked it, I'm ok with the configuration.

@AlekSi
Copy link
Member Author

AlekSi commented Oct 19, 2022

It is "and" by default:

If a pull request matches all of the listed conditions in a rule, the subsequent actions listed in that rule will be applied.

@AlekSi
Copy link
Member Author

AlekSi commented Oct 19, 2022

@rumyantseva PTAL

Copy link
Member

@rumyantseva rumyantseva left a comment

Choose a reason for hiding this comment

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

I'd prefer a longer syntax (not and and being mentioned explicitly) to improve readability and not confuse people, but it's not a strong opinion, so I'm ready to approve it.

@AlekSi
Copy link
Member Author

AlekSi commented Oct 19, 2022

All their examples use implicit and: https://docs.mergify.com/examples/ Just like MongoDB with filters without $and :)

Copy link
Contributor

@chilagrow chilagrow left a comment

Choose a reason for hiding this comment

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

Let's try it out!

@vercel vercel bot temporarily deployed to Preview October 19, 2022 08:59 Inactive
@AlekSi AlekSi merged commit a51aa2d into FerretDB:main Oct 19, 2022
@AlekSi AlekSi deleted the mergify branch October 19, 2022 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code/chore Code maintenance improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants