Next attempt

This commit is contained in:
adrinr 2023-04-18 10:57:38 +01:00
parent 67fc09e256
commit 9fceb6371d
1 changed files with 1 additions and 4 deletions

View File

@ -97,10 +97,7 @@ jobs:
- name: Check submodule - name: Check submodule
run: | run: |
cd packages/pro cd packages/pro
git fetch if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) chore/pro_as_submodule; then
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
echo "Current commit has not been merged to develop" echo "Current commit has not been merged to develop"
exit 1 exit 1
else else