From 9fceb6371d5bb0facf16983782677e02dcfdbba1 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Tue, 18 Apr 2023 10:57:38 +0100
Subject: [PATCH] Next attempt

---
 .github/workflows/budibase_ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 98fcffb9a3..66e1273f3e 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -97,10 +97,7 @@ jobs:
       - name: Check submodule
         run: |
           cd packages/pro
-          git fetch
-          echo $(git log -n 5 --pretty=format:%H)
-          echo $(git branch --contains fa3583ac3eedcb546612e8c696982dda7fae492c)
-          if ! git branch --contains $(git log -n 1 --pretty=format:%H) | grep -q "chore/pro_as_submodule"; then
+          if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) chore/pro_as_submodule; then
             echo "Current commit has not been merged to develop"
             exit 1
           else