From 03a5eef593629c8d75454a435e3fdb946e5408f8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 19:59:01 +0100 Subject: [PATCH] Fix action --- .github/workflows/budibase_ci.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index c5d9bd1a20..ae0fb0738b 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -98,3 +98,26 @@ jobs: cd packages/pro git fetch git merge-base --is-ancestor HEAD develop + if ! git branch --contains HEAD | grep -q "develop"; then + echo "Current commit is not part of main branch" >&2 + exit 1 + fi + - name: Check submodule working + run: | + cd packages/pro + git fetch + git merge-base --is-ancestor HEAD develop + if ! git branch --contains HEAD | grep -q "chore/pro_as_submodule"; then + echo "Current commit is not part of main branch" >&2 + exit 1 + fi + + - name: Check submodule failing + run: | + cd packages/pro + git fetch + git merge-base --is-ancestor HEAD develop + if ! git branch --contains HEAD | grep -q "pro_as_submodule"; then + echo "Current commit is not part of main branch" >&2 + exit 1 + fi