ankidroid / Anki-Android

AnkiDroid: Anki flashcards on Android. Your secret trick to achieve superhuman information retention.
GNU General Public License v3.0
8.21k stars 2.17k forks source link

CI: Block "merge queue" if squash merge label is set #14944

Open david-allison opened 7 months ago

david-allison commented 7 months ago

Squash merge should be performed via admins, adding to the queue would be a mistake and should be blocked

Feasible with GitHub actions, but we need to be sure there's a good developer experience (don't show it as falling to users)


I should have left this to be squashed. My bad

Originally posted by @BrayanDSO in https://github.com/ankidroid/Anki-Android/pull/14904#issuecomment-1847954546

mikehardy commented 7 months ago

There is no way to do it in settings (I just checked) so I think a check that fails is the only way

I believe the developer experience will be okay if it is named well, e.g. "Maintainer check to stop auto-merge if needs squash" or similar

Hard to misinterpret that as "I need to do something" if you're not a maintainer, and explains what it does

So - just a well-considered name for the workflow and a little github action script to check labels and fail if squash-merge is there

Then before this can be closed, that check will need to be added to the branch settings for "main" branch as a required status check for the merge queue

github-actions[bot] commented 4 months ago

Hello 👋, this issue has been opened for more than 3 months with no activity on it. If the issue is still here, please keep in mind that we need community support and help to fix it! Just comment something like still searching for solutions and if you found one, please open a pull request! You have 7 days until this gets closed automatically

github-actions[bot] commented 3 days ago

Hello 👋, this issue has been opened for more than 3 months with no activity on it. If the issue is still here, please keep in mind that we need community support and help to fix it! Just comment something like still searching for solutions and if you found one, please open a pull request! You have 7 days until this gets closed automatically