Fixing an issue where no merge was causing the wrong commit to be found..
This commit is contained in:
parent
e8f68fd457
commit
b215004128
1 changed files with 2 additions and 1 deletions
3
.github/workflows/budibase_ci.yml
vendored
3
.github/workflows/budibase_ci.yml
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue