diff --git a/.github/workflows/automated-release.yml b/.github/workflows/automated-release.yml index 243dc39..19b7a79 100644 --- a/.github/workflows/automated-release.yml +++ b/.github/workflows/automated-release.yml @@ -36,6 +36,11 @@ on: description: "Integrate into SQS" type: boolean default: true + issue-categories: + description: "Jira issue categories to include in the release notes" + required: false + type: string + default: "Feature,False Positive,False Negative,Bug,Security,Maintenance" jobs: release: @@ -63,6 +68,7 @@ jobs: verbose: ${{ github.event.inputs.verbose == 'true' }} use-jira-sandbox: ${{ github.event.inputs.dry-run == 'true' }} is-draft-release: ${{ github.event.inputs.dry-run == 'true' }} + issue-categories: ${{ github.event.inputs.issue-categories }} bump_versions: name: Bump versions @@ -71,5 +77,6 @@ jobs: permissions: contents: write pull-requests: write + id-token: write with: version: ${{ needs.release.outputs.new-version }} diff --git a/.github/workflows/bump-versions.yml b/.github/workflows/bump-versions.yml index 9daaa38..c01e883 100644 --- a/.github/workflows/bump-versions.yml +++ b/.github/workflows/bump-versions.yml @@ -14,7 +14,7 @@ on: jobs: bump-version: - runs-on: sonar-xs + runs-on: github-ubuntu-latest-s permissions: contents: write pull-requests: write @@ -25,8 +25,3 @@ jobs: uses: SonarSource/release-github-actions/bump-version@v1 with: version: ${{ inputs.version }} - - - name: Show PR URL - env: - PR_URL: ${{ steps.bump.outputs.pull-request-url }} - run: echo "PR URL: $PR_URL"