From 767f9ae792d7e5722112fdd117e5749c9f258213 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 18 Apr 2023 11:53:13 +0100 Subject: [PATCH] Test --- .github/workflows/budibase_ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 2954e39957..464cd77ad7 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -101,10 +101,9 @@ jobs: echo $(git branch -r) echo $(git ls-remote --heads) echo $(git log -n 1 --pretty=format:%H) - echo $(git log -n 1 refs/heads/chore/pro_as_submodule) echo $(git log -n 1 origin/chore/pro_as_submodule) echo $(git log -n 1 chore/pro_as_submodule) - if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) refs/heads/chore/pro_as_submodule; then + if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) origin/chore/pro_as_submodule; then echo "Current commit has not been merged to develop" exit 1 else