adam/file-share
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/file-share.git synced 2026-10-07 16:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 5f65d3405e into e46ccf6d73

Browse source
This commit is contained in:
Adam Moussa 2026-08-21 23:14:38 +00:00 • committed by GitHub
commit 8d16ee39f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,10 +2,15 @@ name: Enable auto-merge
on: on:
pull_request: pull_request:
types: [opened, ready_for_review, reopened] types: [opened, ready_for_review, reopened, synchronize]
branches: [main] branches: [main]
concurrency:
group: enable-auto-merge-${{ github.event.pull_request.number }}
cancel-in-progress: true
permissions: permissions:
contents: write
pull-requests: write pull-requests: write
jobs: jobs:
@ -28,4 +33,12 @@ jobs:
echo "auto-merge already enabled" echo "auto-merge already enabled"
exit 0 exit 0
fi fi
gh pr merge "$PR" --repo "$REPO" --auto 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"