From 2ef86cd5de500e0849448c8c235007abdbb4bc00 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Wed, 22 Jan 2025 17:27:49 -0330 Subject: [PATCH] Add logs --- .github/workflows/main.yml | 3 --- .github/workflows/publish-prerelease.yml | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d977c549af1..66192599318d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -85,9 +85,6 @@ jobs: publish-prerelease: name: Publish prerelease if: ${{ github.event_name == 'pull_request' }} - needs: - - wait-for-circleci-workflow-status - - build-beta uses: ./.github/workflows/publish-prerelease.yml secrets: PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }} diff --git a/.github/workflows/publish-prerelease.yml b/.github/workflows/publish-prerelease.yml index 496a61b88e4f..44412b32c929 100644 --- a/.github/workflows/publish-prerelease.yml +++ b/.github/workflows/publish-prerelease.yml @@ -23,7 +23,12 @@ jobs: id: get-merge-base env: BASE_REF: ${{ github.event.pull_request.base.ref }} + HEAD_REF: ${{ github.event.pull_request.head.ref }} run: | + echo "$(git rev-parse HEAD)" + echo "$(git rev-parse origin/${BASE_REF})" + echo "${BASE_REF}" + echo "${HEAD_REF}" merge_base="$(git merge-base "origin/${BASE_REF}" HEAD)" echo "MERGE_BASE=${merge_base}" >> "$GITHUB_OUTPUT" echo "Merge base is '${merge_base}'"