awesome icon indicating copy to clipboard operation
awesome copied to clipboard

chore(mergify): squash by default

Open actionless opened this issue 1 month ago • 2 comments

actionless avatar Nov 17 '25 20:11 actionless

Documentation has been updated for this PR.

Compare view: https://github.com/awesomeWM/apidoc/compare/0e87fd2...8613399 Relevant changes: https://github.com/awesomeWM/apidoc/commit/565f417 Comparison against master (gh-pages): https://github.com/awesomeWM/apidoc/compare/gh-pages...8613399

awesome-robot avatar Nov 17 '25 20:11 awesome-robot

Codecov Report

:white_check_mark: All modified and coverable lines are covered by tests. :white_check_mark: Project coverage is 54.43%. Comparing base (cd36f90) to head (874a3af). :warning: Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4040      +/-   ##
==========================================
+ Coverage   54.36%   54.43%   +0.07%     
==========================================
  Files         262      262              
  Lines       31198    31198              
  Branches     1139     1139              
==========================================
+ Hits        16961    16984      +23     
+ Misses      13732    13708      -24     
- Partials      505      506       +1     

see 10 files with indirect coverage changes

:rocket: New features to boost your workflow:
  • :snowflake: Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

codecov[bot] avatar Nov 17 '25 20:11 codecov[bot]

I don't particularly like that. I noticed you squashed recent PRs, but do we absolutely need to force it every time? For PR with unclean commits, we can do it manually with https://docs.mergify.com/commands/squash/

Aire-One avatar Dec 21 '25 03:12 Aire-One

just statistically amount of PRs which must be squashed is outstandingly bigger than those which need to be merged with retaining sub-commits

and mergify bot unfortunately require access to (SIC!) all of your repositories, that's lame/sus AF

actionless avatar Dec 21 '25 03:12 actionless

just statistically amount of PRs which must be squashed is outstandingly bigger than those which need to be merged with retaining sub-commits

Yeah, I guess :shrug:

Aire-One avatar Dec 21 '25 03:12 Aire-One

@actionless I don't have the access right to force merge when necessary conditions (2 approving reviews) aren't meet, tho...

Aire-One avatar Dec 21 '25 03:12 Aire-One

btw is there a way to set a rule in mergify, "if PR has a tag 'merge-rebase' it would be rebased instead of squashed"?

actionless avatar Dec 21 '25 03:12 actionless