diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index ce01e7b723..00b7c608a8 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -146,23 +146,19 @@ jobs: cd packages/pro pro_commit=$(git rev-parse HEAD) - branch=${{ github.base_ref || github.head_ref || github.ref_name }} - echo "branch=$branch" - echo "base_ref=${{ github.base_ref }}" - echo "head_ref=${{ github.head_ref }}" - echo "ref_name=${{ github.head_ref }}"" + branch=${{ github.base_ref || github.ref_name }} + echo "Running on branch `$branch` (base_ref=${{ github.base_ref }}, ref_name=${{ github.head_ref }})" - echo "Running on branch ${{ github.ref }} if [[ "$branch" == "master" ]]; then - latest_commit=$(git rev-parse origin/master) + base_commit=$(git rev-parse origin/master) else - latest_commit=$(git rev-parse origin/develop) + base_commit=$(git rev-parse origin/develop) fi echo "pro_commit=$pro_commit" echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT" - echo "latest_commit=$latest_commit" - echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT" + echo "base_commit=$base_commit" + echo "base_commit=$base_commit" >> "$GITHUB_OUTPUT" - name: Check submodule merged to develop uses: actions/github-script@v4 @@ -170,9 +166,9 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} script: | const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}'; - const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}'; + const baseCommit = '${{ steps.get_pro_commits.outputs.base_commit }}'; - if (submoduleCommit !== latestCommit) { + if (submoduleCommit !== baseCommit) { console.error('Submodule commit does not match the latest commit on the develop branch.'); console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md') process.exit(1);