Compare commits

...

6 commits

Author SHA1 Message Date
Adam Moussa
dc56defea2
fix(ci): allow dependabot and renovate in mergify queue (#130)
Some checks are pending
ci / ci / ci (push) Waiting to run
2026-08-24 14:13:41 -04:00
Adam Moussa
deff75a3bb
fix: update merge queue configuration (#129)
Signed-off-by: Adam Moussa <null>
2026-08-24 14:09:28 -04:00
mergify[bot]
08e8520c1f
Merge pull request #128 from Sea-Haven-Industries/chore/switch-to-mergify
chore(ci): switch auto-merge from seahaven-bot to Mergify (PLAT-108)
2026-08-24 17:50:58 +00:00
9fb1bb5549
fix(ci): use github-review-decision instead of illegal CODEOWNERS condition 2026-08-24 13:26:42 -04:00
a04036962c
fix(ci): require review and ci before mergify auto-queue 2026-08-24 13:17:14 -04:00
dce935ce31
chore(ci): switch auto-merge from seahaven-bot to Mergify 2026-08-24 13:06:47 -04:00
2 changed files with 38 additions and 44 deletions

View file

@ -1,44 +0,0 @@
name: Enable auto-merge
on:
pull_request:
types: [opened, ready_for_review, reopened, synchronize]
branches: [main]
concurrency:
group: enable-auto-merge-${{ github.event.pull_request.number }}
cancel-in-progress: true
permissions:
contents: write
pull-requests: write
jobs:
enable:
if: >-
github.event.pull_request.draft == false
&& github.event.pull_request.head.repo.full_name == github.repository
&& github.event.pull_request.user.login != 'dependabot[bot]'
&& github.event.pull_request.user.login != 'renovate[bot]'
runs-on: ubuntu-latest
steps:
- name: Enable squash auto-merge
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR: ${{ github.event.pull_request.number }}
REPO: ${{ github.repository }}
run: |
set -euo pipefail
if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then
echo "auto-merge already enabled"
exit 0
fi
if ! out=$(gh pr merge "$PR" --repo "$REPO" --auto 2>&1); then
echo "$out"
if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then
echo "auto-merge already enabled"
exit 0
fi
exit 1
fi
printf '%s\n' "$out"

38
.mergify.yml Normal file
View file

@ -0,0 +1,38 @@
merge_queue:
mode: serial
max_parallel_checks: 1
merge_protections_settings:
auto_merge_conditions:
- base = main
- -draft
- "#approved-reviews-by >= 1"
- github-review-decision = APPROVED
- check-success = "ci / ci"
merge_protections:
- name: require-review-and-ci
if:
- base = main
success_conditions:
- "#approved-reviews-by >= 1"
- github-review-decision = APPROVED
- check-success = "ci / ci"
queue_rules:
- name: default
queue_conditions:
- base = main
- -draft
- "#approved-reviews-by >= 1"
- github-review-decision = APPROVED
- check-success = "ci / ci"
merge_conditions:
- "#approved-reviews-by >= 1"
- github-review-decision = APPROVED
- check-success = "ci / ci"
merge_method: squash
commit_message_format:
title: inherit
body: empty
branch_protection_injection_mode: queue