From 462a454f13513841af69a8fd37e99509474a4d51 Mon Sep 17 00:00:00 2001 From: anmolnagpal Date: Fri, 1 Dec 2023 21:54:59 +0530 Subject: [PATCH 1/6] feat: added auto merge --- .github/workflows/automerge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f2f6ef0..42657f9 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -18,6 +18,7 @@ jobs: automerge: runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - id: automerge name: automerge From 9e3e785b2d38a4f3e2714b8f6974c61848ad8103 Mon Sep 17 00:00:00 2001 From: anmolnagpal Date: Fri, 1 Dec 2023 21:57:16 +0530 Subject: [PATCH 2/6] feat: added auto merge --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 42657f9..8cc6129 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -27,7 +27,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_FILTER_AUTHOR: 'theprashantyadav' MERGE_METHOD: "merge" - MERGE_DELETE_BRANCH: "false" + MERGE_DELETE_BRANCH: "true" MERGE_LABELS: "dependencies,automerge" MERGE_REQUIRED_APPROVALS: "" From 1a43645b9aef589b29bd3a5bc3cc70ee182864ff Mon Sep 17 00:00:00 2001 From: anmolnagpal Date: Fri, 1 Dec 2023 23:12:19 +0530 Subject: [PATCH 3/6] feat: added auto merge --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 8cc6129..e45789e 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -18,7 +18,7 @@ jobs: automerge: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} + if: ${{ success() && github.event_name == 'workflow_run' && github.event.action == 'completed' }} steps: - id: automerge name: automerge From 152561bc71de444bb4ce2abffd32cbe434a977c1 Mon Sep 17 00:00:00 2001 From: anmolnagpal Date: Fri, 1 Dec 2023 23:15:18 +0530 Subject: [PATCH 4/6] feat: added auto merge --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index e45789e..e603270 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -18,7 +18,7 @@ jobs: automerge: runs-on: ubuntu-latest - if: ${{ success() && github.event_name == 'workflow_run' && github.event.action == 'completed' }} + if: ${{ success() && github.event_name == 'Run Checks' && github.event.action == 'completed' }} steps: - id: automerge name: automerge From 789051929367ac593471312b0a468dd7c270e4b8 Mon Sep 17 00:00:00 2001 From: anmolnagpal Date: Fri, 1 Dec 2023 23:16:40 +0530 Subject: [PATCH 5/6] feat: added auto merge --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index e603270..89d7d22 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -18,7 +18,7 @@ jobs: automerge: runs-on: ubuntu-latest - if: ${{ success() && github.event_name == 'Run Checks' && github.event.action == 'completed' }} + if: ${{ success() && github.event_name == 'Run Checks' && github.event.action == 'workflow_run' }} steps: - id: automerge name: automerge From 6c44bfb77516b3976edf8cdc1b1c7aede5ee5df1 Mon Sep 17 00:00:00 2001 From: anmolnagpal Date: Fri, 1 Dec 2023 23:19:41 +0530 Subject: [PATCH 6/6] feat: added auto merge --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b0a90a..79fb6ed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,8 +8,8 @@ on: jobs: check_workflow_status: runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Check Workflow Status - if: ${{ github.event.workflow_run.conclusion == 'success' }} run: | echo "The triggering workflow was successful!"