CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-12 23:43:09 +12:00
Code Issues Projects Releases Wiki Activity

Fixing an issue where no merge was causing the wrong commit to be found..

Browse source
This commit is contained in:
mike12345567 2024-06-26 12:52:21 +01:00
parent e8f68fd457
commit b215004128
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/budibase_ci.yml vendored
View file

@ -233,10 +233,11 @@ jobs:
if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }} if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
run: | run: |
cd packages/pro 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 }}' base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}' 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 if [ -n "$any_commit" ]; then
echo $any_commit echo $any_commit