Fix checks

This commit is contained in:
Adria Navarro 2024-03-27 12:24:16 +01:00
parent 02e2d26985
commit 4fb6217730
1 changed files with 6 additions and 1 deletions

View File

@ -243,8 +243,13 @@ jobs:
if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
run: |
base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
any_commit=$(git log origin/master...$base_commit_excluding_merges)
pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}'
any_commit=$(git log $base_commit_excluding_merges...$pro_commit)
if [ -n "$any_commit" ]; then
echo $any_commit
echo "An error occurred: <error_message>"
echo 'Submodule commit does not match the latest commit on the "${{ steps.get_pro_commits.outputs.target_branch }}" branch.'
echo 'Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/master/docs/getting_started.md'