adam/forgejo
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/forgejo.git synced 2026-09-30 07:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ci): enqueue merge queue as seahaven-bot

Browse source
This commit is contained in:
Adam Moussa 2026-08-24 11:04:42 -04:00
parent f7d47d7ae8
commit a11cee3a04
No known key found for this signature in database
1 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
.github/workflows/auto-merge.yaml vendored
View file

@ -4,14 +4,15 @@ on:
pull_request: pull_request:
types: [opened, ready_for_review, reopened, synchronize] types: [opened, ready_for_review, reopened, synchronize]
branches: [main] branches: [main]
pull_request_review:
types: [submitted]
concurrency: concurrency:
group: enable-auto-merge-${{ github.event.pull_request.number }} group: enable-auto-merge-${{ github.event.pull_request.number }}
cancel-in-progress: true cancel-in-progress: true
permissions: permissions:
contents: write contents: read
pull-requests: write
jobs: jobs:
enable: enable:
@ -20,25 +21,47 @@ jobs:
&& github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.head.repo.full_name == github.repository
&& github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'dependabot[bot]'
&& github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'renovate[bot]'
&& (github.event_name != 'pull_request_review' || github.event.review.state == 'approved')
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Enable squash auto-merge - name: Mint seahaven-bot token
id: app-token
uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
with:
app-id: ${{ secrets.SEAHAVEN_BOT_APP_ID }}
private-key: ${{ secrets.SEAHAVEN_BOT_PRIVATE_KEY }}
owner: Sea-Haven-Industries
repositories: ${{ github.event.repository.name }}
- name: Enqueue or arm auto-merge
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ steps.app-token.outputs.token }}
PR: ${{ github.event.pull_request.number }} PR: ${{ github.event.pull_request.number }}
REPO: ${{ github.repository }} REPO: ${{ github.repository }}
PR_NODE_ID: ${{ github.event.pull_request.node_id }}
run: | run: |
set -euo pipefail set -euo pipefail
if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then in_queue="$(gh api graphql -f query='query($id:ID!) { node(id:$id) { ... on PullRequest { isInMergeQueue } } }' -f id="$PR_NODE_ID" --jq '.data.node.isInMergeQueue')"
echo "auto-merge already enabled" if [ "$in_queue" = "true" ]; then
echo "already in merge queue"
exit 0 exit 0
fi fi
if ! out=$(gh pr merge "$PR" --repo "$REPO" --auto 2>&1); then set +e
echo "$out" out="$(gh api graphql -f query='mutation($id:ID!) { enqueuePullRequest(input:{pullRequestId:$id}) { mergeQueueEntry { state } } }' -f id="$PR_NODE_ID" 2>&1)"
status=$?
set -e
if [ "$status" -eq 0 ]; then
printf '%s\n' "$out"
exit 0
fi
echo "$out"
# Re-arm as seahaven-bot. A leftover GITHUB_TOKEN auto-merge would
# enqueue without starting merge_group.
gh pr merge "$PR" --repo "$REPO" --disable-auto || true
if ! gh pr merge "$PR" --repo "$REPO" --auto; then
if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then
echo "auto-merge already enabled" echo "auto-merge already enabled"
exit 0 exit 0
fi fi
exit 1 exit 1
fi fi
printf '%s\n' "$out"