From 5681f31da9e02cd83d344b3a9c203474113a7ad5 Mon Sep 17 00:00:00 2001 From: frazarshad Date: Tue, 13 Aug 2024 22:28:24 +0500 Subject: [PATCH 1/2] ci: updated config for mergify --- .mergify.yml | 145 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 111 insertions(+), 34 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index c57ae13..3fe7b29 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,64 +1,141 @@ # Linear queue for the main branch. -queue_rules: - - name: high_priority_main - commit_message_template: |- +shared: + commit_message_template: &commit-message-template |- {{ title }} (#{{ number }}) {{ body | trim }} - queue_conditions: + queue_conditions: &queue-conditions - base=main - - label=priority:high - or: - check-pending=integration-test-result - check-success=integration-test-result - label=bypass:integration - merge_conditions: + high_priority_queue_conditions: &high-priority-queue-conditions + - and: *queue-conditions + - label=priority:high + merge_conditions: &merge-conditions - base=main + # Rebase PRs with fixup commits are allowed to enter the merge queue but + # should not be allowed to merge if there are leftover fixup commits after rebase + - or: + - label=bypass:linear-history + - check-success=no-fixup-commits + - check-skipped=no-fixup-commits # Require integration tests before merging only - or: - label=bypass:integration - check-success=integration-test-result - - name: main - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body | trim }} - queue_conditions: + pr_queue_merge_conditions: &pr-queue-merge-conditions - base=main + - label=automerge:no-update - or: - - check-pending=integration-test-result - - check-success=integration-test-result - - label=bypass:integration - merge_conditions: + - '#commits-behind=0' + - label=bypass:linear-history + pr_queue_rebase_conditions: &pr-queue-rebase-conditions - base=main - # Require integration tests before merging only + - label=automerge:rebase - or: - - label=bypass:integration - - check-success=integration-test-result + - '#commits-behind>0' + - linear-history + pr_queue_squash_conditions: &pr-queue-squash-conditions + - base=main + - label=automerge:squash + +queue_rules: + - name: high_priority_rebase + commit_message_template: *commit-message-template + queue_conditions: *high-priority-queue-conditions + merge_conditions: *merge-conditions + merge_method: merge + update_method: rebase + + - name: high_priority_merge + commit_message_template: *commit-message-template + queue_conditions: *high-priority-queue-conditions + merge_conditions: *merge-conditions + disallow_checks_interruption_from_queues: + - high_priority_rebase + merge_method: merge + + - name: high_priority_squash + commit_message_template: *commit-message-template + queue_conditions: *high-priority-queue-conditions + merge_conditions: *merge-conditions + disallow_checks_interruption_from_queues: + - high_priority_rebase + - high_priority_merge + merge_method: squash + + - name: rebase + commit_message_template: *commit-message-template + queue_conditions: *queue-conditions + merge_conditions: *merge-conditions + merge_method: merge + update_method: rebase + + - name: merge + commit_message_template: *commit-message-template + queue_conditions: *queue-conditions + merge_conditions: *merge-conditions + disallow_checks_interruption_from_queues: + - rebase + merge_method: merge + + - name: squash + commit_message_template: *commit-message-template + queue_conditions: *queue-conditions + merge_conditions: *merge-conditions + disallow_checks_interruption_from_queues: + - rebase + - merge + merge_method: squash pull_request_rules: - - name: merge to main + - name: high priority - merge to main conditions: - - base=main - - label=automerge:no-update - - or: - - '#commits-behind=0' - - label=bypass:linear-history + - and: *pr-queue-merge-conditions + - label=priority:high actions: queue: - merge_method: merge - - name: rebase updates then merge to main + name: high_priority_merge + - name: high priority - rebase updates then merge to main conditions: - - base=main - - label=automerge:rebase + - and: *pr-queue-rebase-conditions + - label=priority:high actions: queue: - merge_method: merge - update_method: rebase + name: high_priority_rebase + - name: high priority - squash to main + conditions: + - and: *pr-queue-squash-conditions + - label=priority:high + actions: + queue: + name: high_priority_squash + - name: merge to main + conditions: *pr-queue-merge-conditions + actions: + queue: + name: merge + - name: rebase updates then merge to main + conditions: *pr-queue-rebase-conditions + actions: + queue: + name: rebase - name: squash to main + conditions: *pr-queue-squash-conditions + actions: + queue: + name: squash + - name: rebase and autosquash conditions: - base=main - - label=automerge:squash + - label=automerge:rebase + - '#commits-behind=0' + - or: + - -linear-history + - check-failure=no-fixup-commits + - -draft actions: - queue: - merge_method: squash + rebase: + autosquash: true From dc4b38ce70b871c6cdff4988b7bd440dcf37d9e3 Mon Sep 17 00:00:00 2001 From: frazarshad Date: Tue, 13 Aug 2024 22:34:05 +0500 Subject: [PATCH 2/2] ci: added no-fixup-commits check --- .github/workflows/mergify-ready.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.github/workflows/mergify-ready.yml b/.github/workflows/mergify-ready.yml index e2fe06e..b7a5090 100644 --- a/.github/workflows/mergify-ready.yml +++ b/.github/workflows/mergify-ready.yml @@ -81,3 +81,32 @@ jobs: echo -e "$fixup_commits" exit 1 fi + + no-fixup-commits: + runs-on: ubuntu-latest + if: >- + github.event_name == 'pull_request' && + github.event.pull_request.draft == false && + github.event.pull_request.base.ref == 'main' && + contains(github.event.pull_request.labels.*.name, 'automerge:rebase') && + !contains(github.event.pull_request.labels.*.name, 'bypass:linear-history') + + env: + HEAD_SHA: ${{ github.event.pull_request.head.sha }} + BASE_SHA: ${{ github.event.pull_request.base.sha }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Check for fixup commits + id: fixup-commits + run: | + if [[ $(git rev-list "$BASE_SHA".."$HEAD_SHA" --grep="^\(fixup\|amend\|squash\)! " | wc -l) -eq 0 ]]; then + echo "No fixup/amend/squash commits found in commit history" + else + echo "fixup/amend/squash commits found in commit history" + exit 1 + fi