Fix
This commit is contained in:
parent
307587c982
commit
061ec2eb2d
|
@ -97,8 +97,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
cd packages/pro
|
cd packages/pro
|
||||||
git fetch
|
git fetch
|
||||||
git merge-base --is-ancestor HEAD develop
|
if ! git branch --contains HEAD | grep -q "origin/develop"; then
|
||||||
if ! git branch --contains HEAD | grep -q "develop"; then
|
|
||||||
echo "Current commit is not part of main branch" >&2
|
echo "Current commit is not part of main branch" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -115,8 +114,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
cd packages/pro
|
cd packages/pro
|
||||||
git fetch
|
git fetch
|
||||||
git merge-base --is-ancestor HEAD develop
|
if ! git branch --contains HEAD | grep -q "origin/chore/pro_as_submodule"; then
|
||||||
if ! git branch --contains HEAD | grep -q "chore/pro_as_submodule"; then
|
|
||||||
echo "Current commit is not part of main branch" >&2
|
echo "Current commit is not part of main branch" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -133,7 +131,6 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
cd packages/pro
|
cd packages/pro
|
||||||
git fetch
|
git fetch
|
||||||
git merge-base --is-ancestor HEAD develop
|
|
||||||
if ! git branch --contains HEAD | grep -q "pro_as_submodule"; then
|
if ! git branch --contains HEAD | grep -q "pro_as_submodule"; then
|
||||||
echo "Current commit is not part of main branch" >&2
|
echo "Current commit is not part of main branch" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Reference in New Issue