1
0
Fork 0
mirror of synced 2024-09-17 09:49:11 +12:00

Merge branch 'master' of github.com:Budibase/budibase into revert-14020-revert-13993-fix/disallow-prohibited-columns

This commit is contained in:
mike12345567 2024-06-26 13:26:06 +01:00
commit 17e42ff413

View file

@ -233,10 +233,11 @@ jobs:
if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
run: |
cd packages/pro
base_commit='${{ steps.get_pro_commits.outputs.base_commit }}'
base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}'
any_commit=$(git log --no-merges $base_commit_excluding_merges...$pro_commit)
any_commit=$(git log --no-merges $base_commit...$pro_commit)
if [ -n "$any_commit" ]; then
echo $any_commit