From 291908dde091df9843179a64b8455dff14a68c18 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 18 Apr 2023 11:32:02 +0100 Subject: [PATCH] Next --- .github/workflows/budibase_ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index db8806a14f..605db748d5 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -96,11 +96,12 @@ jobs: - name: Check submodule run: | cd packages/pro - echo $(git branch -r) + echo $(git ls-remote --heads) git fetch --all echo $(git branch -r) + echo $(git ls-remote --heads) echo $(git log -n 1 --pretty=format:%H) - if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) origin/chore/pro_as_submodule; then + if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) refs/heads/chore/pro_as_submodule; then echo "Current commit has not been merged to develop" exit 1 else