@@ -21,11 +21,10 @@ jobs:
2121 prerequisites :
2222 name : " Prerequisites"
2323 outputs :
24- release-version : ${{ steps.determine-branch-names.outputs.RELEASE_VERSION }}
25- release-tag : ${{ steps.determine-branch-names.outputs.RELEASE_TAG }}
2624 code-branch : ${{ steps.determine-branch-names.outputs.CODE_BRANCH_NAME }}
2725 docs-branch : ${{ steps.determine-branch-names.outputs.DOCS_BRANCH_NAME }}
2826 release-notes-branch : ${{ steps.determine-branch-names.outputs.RELEASE_NOTES_BRANCH_NAME }}
27+ release-tag : ${{ steps.determine-branch-names.outputs.RELEASE_TAG }}
2928 release-commit : ${{ steps.determine-branch-names.outputs.RELEASE_COMMIT }}
3029 permissions :
3130 pull-requests : read
@@ -35,29 +34,17 @@ jobs:
3534 - name : " Determine Branch Names"
3635 id : determine-branch-names
3736 run : |
38- if [[ "${{ github.event_name }}" == "pull_request_review" ]]; then
39- echo "[DEBUG] Taking branch name from pull request event"
40- BRANCH_NAME=${{ github.event.pull_request.head.ref }}
41- elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
42- echo "[DEBUG] Taking branch name from workflow dispatch event"
43- BRANCH_NAME=$(gh pr view ${{ github.event.inputs.release_pr_number }} --repo "${{ github.repository }}" --json headRefName | jq -r '.headRefName')
44- else
45- echo "Cannot determine branch name from event '${{ github.event_name }}'"
46- exit 1
47- fi
48-
49- RELEASE_VERSION=$(echo "$BRANCH_NAME" | cut -d '-' -f2)
50- DOCS_BRANCH=java/release-docs-$RELEASE_VERSION
51- RELEASE_NOTES_BRANCH=java/release-notes-$RELEASE_VERSION
37+ CODE_BRANCH_NAME=$(gh pr view ${{github.event.inputs.release_pr_number}} --repo ${{github.repository}} --json headRefName --jq '.headRefName')
38+ RELEASE_VERSION=$(echo $CODE_BRANCH_NAME | cut -d '-' -f2)
39+ RELEASE_TAG=rel/$RELEASE_VERSION
40+ RELEASE_COMMIT=$(gh release view $RELEASE_TAG --repo ${{github.repository}} --json targetCommitish --jq '.targetCommitish')
5241
42+ echo "CODE_BRANCH_NAME=$CODE_BRANCH_NAME" >> $GITHUB_OUTPUT
5343 echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
54- echo "RELEASE_TAG=rel/$RELEASE_VERSION" >> $GITHUB_OUTPUT
55- echo "CODE_BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
56- echo "DOCS_BRANCH_NAME=$DOCS_BRANCH" >> $GITHUB_OUTPUT
57- echo "RELEASE_NOTES_BRANCH_NAME=$RELEASE_NOTES_BRANCH" >> $GITHUB_OUTPUT
58- echo "RELEASE_COMMIT=$(gh release view "$RELEASE_TAG" --repo "${{ github.repository }}" --json targetCommitish | jq -r '.targetCommitish')" >> $GITHUB_OUTPUT
44+ echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_OUTPUT
45+ echo "RELEASE_COMMIT=$RELEASE_COMMIT" >> $GITHUB_OUTPUT
5946
60- echo "[DEBUG] Current GITHUB_OUTPUT: ' $(cat $GITHUB_OUTPUT)' "
47+ echo -e "[DEBUG] Current GITHUB_OUTPUT:\n $(cat $GITHUB_OUTPUT)"
6148 env :
6249 GH_TOKEN : ${{ github.token }}
6350
0 commit comments