Skip to content

[ISSUE #541]🔨Add Auto-Merge #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Auto Merge PR
on:
pull_request:
types:
- labeled
- synchronize
- opened

jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: automerge
uses: "pascalgn/[email protected]"
env:
GITHUB_TOKEN: "${{ secrets.PAT_TOKEN }}"
MERGE_LABELS: "auto merge"
MERGE_REMOVE_LABELS: "auto merge"
MERGE_METHOD: "squash"
MERGE_COMMIT_MESSAGE: "🚀This PR has been automatically merged with squash.🎉"
MERGE_FORKS: "false"
MERGE_RETRIES: "6"
MERGE_RETRY_SLEEP: "10000"
MERGE_REQUIRED_APPROVALS: "0"
UPDATE_METHOD: "rebase"

- name: Add comment
if: success() && steps.automerge.outputs.merged == 'true'
uses: actions/github-script@v7
with:
github-token: ${{ secrets.PAT_TOKEN }}
script: |
const { owner, repo, number: issue_number } = context.issue;
github.rest.issues.createComment({
owner,
repo,
issue_number,
body: "🚀This PR has been automatically merged with squash.🚀"
})
Comment on lines +27 to +39
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure the script for adding comments is robust against possible API failures.

Consider wrapping the API call in a try-catch block to handle potential failures gracefully.

            try {
              const { owner, repo, number: issue_number } = context.issue;
              await github.rest.issues.createComment({
                owner,
                repo,
                issue_number,
                body: "🚀This PR has been automatically merged with squash.🚀"
              });
            } catch (error) {
              console.error('Failed to post merge comment:', error);
            }
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- name: Add comment
if: success() && steps.automerge.outputs.merged == 'true'
uses: actions/github-script@v7
with:
github-token: ${{ secrets.PAT_TOKEN }}
script: |
const { owner, repo, number: issue_number } = context.issue;
github.rest.issues.createComment({
owner,
repo,
issue_number,
body: "🚀This PR has been automatically merged with squash.🚀"
})
script: |
try {
const { owner, repo, number: issue_number } = context.issue;
await github.rest.issues.createComment({
owner,
repo,
issue_number,
body: "🚀This PR has been automatically merged with squash.🚀"
});
} catch (error) {
console.error('Failed to post merge comment:', error);
}

Loading