From e335eef597b85a68938e56260217966ff52283a1 Mon Sep 17 00:00:00 2001 From: Siddhant Khare Date: Wed, 22 Jun 2022 00:13:33 +0530 Subject: [PATCH 1/2] feat: auto merge PR workflow :sparkles: --- .github/workflows/auto-merge.yml | 54 ++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index b7bd5a0..a8341c9 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -6,32 +6,38 @@ on: workflow_dispatch: jobs: - automatic-pr-merge: - name: Automatic PR Merge + detect-files-changed: + name: Detect File Changes runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v3 - name: Verify Changed files - uses: tj-actions/verify-changed-files@v8.8 - id: changed_files + uses: tj-actions/verify-changed-files@v9.2 + id: verify-changed-files with: - files: _users/* - - - uses: actions/checkout@v2 - with: - persist-credentials: false - fetch-depth: 0 - - - name: Commit files - if: steps.changed_files.outputs.files_changed == 'true' + files: | + *.md + _users + - name: Run step only when files change. # For Debugging + if: steps.verify-changed-files.outputs.files_changed == 'true' run: | - git config --local user.email "github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - git add _users/* - git commit -m "Updated Achievements :rocket:" - - - name: Push changes - if: steps.changed_files.outputs.files_changed == 'true' - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ github.ref }} + echo "Changed files: ${{ steps.verify-changed-files.outputs.changed_files }}" + merge-pr: + name: Merge PRs for Users Data + needs: detect-files-changed + runs-on: ubuntu-latest + steps: + - name: automerge + uses: "pascalgn/automerge-action@v0.15.3" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_LABELS: "" + MERGE_METHOD: "squash" + MERGE_COMMIT_MESSAGE: "pull-request-title-and-description" + MERGE_FORKS: "false" + MERGE_RETRIES: "6" + MERGE_RETRY_SLEEP: "10000" + MERGE_DELETE_BRANCH: true + UPDATE_LABELS: "" + UPDATE_METHOD: "rebase" From c9fcc30f50f21c120f4dcb6d4cb8c46061f0aca8 Mon Sep 17 00:00:00 2001 From: Siddhant Khare Date: Wed, 22 Jun 2022 12:33:39 +0530 Subject: [PATCH 2/2] allow merging PR from forks --- .github/workflows/auto-merge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index a8341c9..93c9e48 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -35,7 +35,6 @@ jobs: MERGE_LABELS: "" MERGE_METHOD: "squash" MERGE_COMMIT_MESSAGE: "pull-request-title-and-description" - MERGE_FORKS: "false" MERGE_RETRIES: "6" MERGE_RETRY_SLEEP: "10000" MERGE_DELETE_BRANCH: true