@@ -95,13 +95,12 @@ jobs:
9595 id : issue
9696 env :
9797 JIRA_BASE_URL : ${{ vars.JIRA_BASE_URL }}
98- JIRA_EMAIL : ${{ secrets.JIRA_EMAIL }}
99- JIRA_API_TOKEN : ${{ secrets.JIRA_API_TOKEN }}
98+ JIRA_BEARER_TOKEN : ${{ secrets.JIRA_BEARER_TOKEN || secrets.JIRA_API_TOKEN }}
10099 JIRA_KEY : ${{ steps.jira.outputs.JIRA_KEY }}
101100 MAX_DESC_CHARS : ${{ env.MAX_DESC_CHARS }}
102101 run : |
103102 set -euo pipefail
104- for v in JIRA_BASE_URL JIRA_EMAIL JIRA_API_TOKEN JIRA_KEY; do
103+ for v in JIRA_BASE_URL JIRA_BEARER_TOKEN JIRA_KEY; do
105104 if [ -z "${!v:-}" ]; then
106105 echo "Missing required Jira configuration: $v"
107106 exit 1
@@ -123,7 +122,8 @@ jobs:
123122 esac
124123 ISSUE_URL="$API_BASE_URL/issue/$JIRA_KEY"
125124
126- HTTP_CODE=$(curl -sS --retry 3 --retry-delay 2 -u "$JIRA_EMAIL:$JIRA_API_TOKEN" \
125+ HTTP_CODE=$(curl -sS --retry 3 --retry-delay 2 \
126+ -H "Authorization: Bearer $JIRA_BEARER_TOKEN" \
127127 -H "Accept: application/json" \
128128 -o jira.json \
129129 -w "%{http_code}" \
@@ -389,13 +389,12 @@ jobs:
389389 - name : Comment back on Jira with PR link
390390 env :
391391 JIRA_BASE_URL : ${{ vars.JIRA_BASE_URL }}
392- JIRA_EMAIL : ${{ secrets.JIRA_EMAIL }}
393- JIRA_API_TOKEN : ${{ secrets.JIRA_API_TOKEN }}
392+ JIRA_BEARER_TOKEN : ${{ secrets.JIRA_BEARER_TOKEN || secrets.JIRA_API_TOKEN }}
394393 JIRA_KEY : ${{ steps.jira.outputs.JIRA_KEY }}
395394 PR_URL : ${{ steps.pr.outputs.PR_URL }}
396395 run : |
397396 set -euo pipefail
398- for v in JIRA_BASE_URL JIRA_EMAIL JIRA_API_TOKEN JIRA_KEY; do
397+ for v in JIRA_BASE_URL JIRA_BEARER_TOKEN JIRA_KEY; do
399398 if [ -z "${!v:-}" ]; then
400399 echo "Missing required Jira configuration: $v"
401400 exit 1
@@ -438,7 +437,8 @@ jobs:
438437 }')
439438
440439 COMMENT_URL="$API_BASE_URL/issue/$JIRA_KEY/comment"
441- HTTP_CODE=$(curl -sS --retry 3 --retry-delay 2 -u "$JIRA_EMAIL:$JIRA_API_TOKEN" \
440+ HTTP_CODE=$(curl -sS --retry 3 --retry-delay 2 \
441+ -H "Authorization: Bearer $JIRA_BEARER_TOKEN" \
442442 -H "Accept: application/json" \
443443 -H "Content-Type: application/json" \
444444 -X POST \
0 commit comments