From 4e6d0c91655cd5e148d2d329f6d56c3e840d45ac Mon Sep 17 00:00:00 2001
From: Thomas Griseau <48803465+griseau@users.noreply.github.com>
Date: Thu, 26 Oct 2023 13:18:30 +0200
Subject: [PATCH] ci: avoid dependabot to merge if tests fails (#1826)

---
 .github/workflows/continuous-integration.yaml | 19 +++++++++++++++---
 .github/workflows/merge-me.yaml               | 20 -------------------
 2 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 .github/workflows/merge-me.yaml

diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
index 2c0e6adfb44..cc058e3894e 100644
--- a/.github/workflows/continuous-integration.yaml
+++ b/.github/workflows/continuous-integration.yaml
@@ -4,9 +4,6 @@ on:
   pull_request:
     branches:
       - master
-  push:
-    branches:
-      - master
 
 jobs:
   build:
@@ -131,3 +128,19 @@ jobs:
       - name: Types
         run: npm run types
     timeout-minutes: 5
+  merge-me:
+    needs:
+      - build
+      - format
+      - lint
+      - spellcheck
+      - test
+      - types
+    name: Merge me!
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge me!
+        uses: ridedott/merge-me-action@master
+        with:
+          GITHUB_TOKEN: ${{ secrets.DOTTBOTT_TOKEN }}
+    timeout-minutes: 5
diff --git a/.github/workflows/merge-me.yaml b/.github/workflows/merge-me.yaml
deleted file mode 100644
index bea0e0b7d5d..00000000000
--- a/.github/workflows/merge-me.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Merge me!
-
-on:
-  workflow_run:
-    types:
-      - completed
-    workflows:
-      - 'Continuous Integration'
-
-jobs:
-  merge-me:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    name: Merge me!
-    runs-on: ubuntu-latest
-    steps:
-      - name: Merge me!
-        uses: ridedott/merge-me-action@master
-        with:
-          GITHUB_TOKEN: ${{ secrets.DOTTBOTT_TOKEN }}
-    timeout-minutes: 5