Skip to content

Commit 461ec61

Browse files
GHA-154 Fix automated-release workflow to generate correct integration PRs (#69)
1 parent 7cdbf82 commit 461ec61

1 file changed

Lines changed: 25 additions & 17 deletions

File tree

.github/workflows/automated-release.yml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,6 @@ jobs:
274274
id-token: write
275275
outputs:
276276
new-version: ${{ steps.create-jira-version.outputs.jira-new-version-name }}
277-
sqc-ticket-key: ${{ steps.create-sc-ticket.outputs.ticket-key }}
278-
sqc-ticket-url: ${{ steps.create-sc-ticket.outputs.ticket-url }}
279-
sqs-ticket-key: ${{ steps.create-sonar-ticket.outputs.ticket-key }}
280-
sqs-ticket-url: ${{ steps.create-sonar-ticket.outputs.ticket-url }}
281277
steps:
282278
- name: Release in Jira
283279
uses: SonarSource/release-github-actions/release-jira-version@v1
@@ -300,7 +296,7 @@ jobs:
300296
if: ${{ inputs.verbose }}
301297
shell: bash
302298
env:
303-
NEW_VERSION: ${{ inputs.new-version }}
299+
NEW_VERSION: ${{ inputs.new-version || 'not specified, autoincrement minor version' }}
304300
PM_EMAIL: ${{ inputs.pm-email }}
305301
run: |
306302
echo "## 🗂️ Release in Jira" >> $GITHUB_STEP_SUMMARY
@@ -327,7 +323,9 @@ jobs:
327323
id-token: write
328324
outputs:
329325
sqc-ticket-key: ${{ steps.create-sqc-ticket.outputs.ticket-key }}
326+
sqc-ticket-url: ${{ steps.create-sqc-ticket.outputs.ticket-url }}
330327
sqs-ticket-key: ${{ steps.create-sqs-ticket.outputs.ticket-key }}
328+
sqs-ticket-url: ${{ steps.create-sqs-ticket.outputs.ticket-url }}
331329
runs-on: ${{ inputs.runner-environment }}
332330
steps:
333331
- name: Create SLVS Ticket
@@ -430,7 +428,7 @@ jobs:
430428
update-analyzers:
431429
name: Update Analyzers in SQS and SQC
432430
runs-on: ${{ inputs.runner-environment }}
433-
needs: [ create-integration-tickets ]
431+
needs: [ prepare-release, create-integration-tickets ]
434432
if: ${{ (inputs.sqs-integration || inputs.sqc-integration) && inputs.release-automation-secret-name != '' }}
435433
permissions:
436434
id-token: write
@@ -501,6 +499,16 @@ jobs:
501499
steps:
502500
- name: Post Summary to Workflow
503501
shell: bash
502+
env:
503+
RELEASE_VERSION: ${{ needs.prepare-release.outputs.release-version }}
504+
NEW_VERSION: ${{ needs.release-in-jira.outputs.new-version || 'not created' }}
505+
JIRA_RELEASE_URL: ${{ needs.prepare-release.outputs.jira-release-url || 'not resolved' }}
506+
RELEASE_TICKET_URL: ${{ needs.create-release-ticket.outputs.release-ticket-url || 'not created' }}
507+
GITHUB_RELEASE_URL: ${{ needs.publish-github-release.outputs.github-release-url || 'not created' }}
508+
SQS_TICKET_URL: ${{ needs.create-integration-tickets.outputs.sqs-ticket-url || 'not created' }}
509+
SQC_TICKET_URL: ${{ needs.create-integration-tickets.outputs.sqc-ticket-url || 'not created' }}
510+
SQS_PR_URL: ${{ needs.update-analyzers.outputs.sqs-pull-request-url || 'not created' }}
511+
SQC_PR_URL: ${{ needs.update-analyzers.outputs.sqc-pull-request-url || 'not created' }}
504512
run: |
505513
ALL_SUCCESS=$(echo '${{ toJson(needs) }}' | jq -r 'to_entries | all(.value.result == "success")')
506514
@@ -513,17 +521,17 @@ jobs:
513521
fi
514522
echo "" >> $GITHUB_STEP_SUMMARY
515523
516-
echo "## Key Links" >> $GITHUB_STEP_SUMMARY
517-
echo "- Released Version: \`${{ needs.prepare-release.outputs.release-version }}\`" >> $GITHUB_STEP_SUMMARY
518-
echo "- New Version: \`${{ needs.release-in-jira.outputs.new-version }}\`" >> $GITHUB_STEP_SUMMARY
519-
echo "- Jira Release: ${{ needs.prepare-release.outputs.jira-release-url }}" >> $GITHUB_STEP_SUMMARY
520-
echo "- Release Ticket: ${{ needs.create-release-ticket.outputs.release-ticket-url }}" >> $GITHUB_STEP_SUMMARY
521-
echo "- GitHub Release: ${{ needs.publish-github-release.outputs.github-release-url }}" >> $GITHUB_STEP_SUMMARY
522-
echo "- SQS Integration Ticket: ${{ needs.release-in-jira.outputs.sqs-ticket-url }}" >> $GITHUB_STEP_SUMMARY
523-
echo "- SQC Integration Ticket: ${{ needs.release-in-jira.outputs.sqc-ticket-url }}" >> $GITHUB_STEP_SUMMARY
524-
echo "- SQS Analyzer PR: ${{ needs.update-analyzers.outputs.sqs-pull-request-url }}" >> $GITHUB_STEP_SUMMARY
525-
echo "- SQC Analyzer PR: ${{ needs.update-analyzers.outputs.sqc-pull-request-url }}" >> $GITHUB_STEP_SUMMARY
526-
echo "" >> $GITHUB_STEP_SUMMARY
524+
cat <<EOF >> $GITHUB_STEP_SUMMARY
525+
- Released Version: \`$RELEASE_VERSION\`
526+
- New Version: \`$NEW_VERSION\`
527+
- Jira Release: $JIRA_RELEASE_URL
528+
- Release Ticket: $RELEASE_TICKET_URL
529+
- GitHub Release: $GITHUB_RELEASE_URL
530+
- SQS Integration Ticket: $SQS_TICKET_URL
531+
- SQC Integration Ticket: $SQC_TICKET_URL
532+
- SQS Analyzer PR: $SQS_PR_URL
533+
- SQC Analyzer PR: $SQC_PR_URL
534+
EOF
527535
528536
echo "## Guidance" >> $GITHUB_STEP_SUMMARY
529537
if [[ "$ALL_SUCCESS" == "true" ]]; then

0 commit comments

Comments
 (0)