diff --git a/.github/actions/send-notification/action.yml b/.github/actions/send-notification/action.yml index 4bcd642a4b9..1f857bfd811 100644 --- a/.github/actions/send-notification/action.yml +++ b/.github/actions/send-notification/action.yml @@ -6,21 +6,25 @@ inputs: required: true build-scan-url: description: 'URL of the build scan to include in the notification' + run-name: + description: 'Name of the run to include in the notification' + default: ${{ format('{0} {1}', github.ref_name, github.job) }} runs: using: composite steps: - shell: bash run: | echo "BUILD_SCAN=${{ inputs.build-scan-url == '' && ' [build scan unavailable]' || format(' [<{0}|Build Scan>]', inputs.build-scan-url) }}" >> "$GITHUB_ENV" + echo "RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> "$GITHUB_ENV" - shell: bash if: ${{ success() }} run: | - curl -X POST ${{ inputs.webhook-url }} -H 'Content-Type: application/json' -d '{ text: "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|spring-boot-${{ github.ref_name }} ${{ github.job }} was successful> ${{ env.BUILD_SCAN }}"}' || true + curl -X POST ${{ inputs.webhook-url }} -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was successful ${{ env.BUILD_SCAN }}"}' || true - shell: bash if: ${{ failure() }} run: | - curl -X POST ${{ inputs.webhook-url }} -H 'Content-Type: application/json' -d '{ text: " *<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|spring-boot-${{ github.ref_name }} ${{ github.job }} failed>* ${{ env.BUILD_SCAN }}"}' || true + curl -X POST ${{ inputs.webhook-url }} -H 'Content-Type: application/json' -d '{ text: " *<${{ env.RUN_URL }}|${{ inputs.run-name }}> failed* ${{ env.BUILD_SCAN }}"}' || true - shell: bash if: ${{ cancelled() }} run: | - curl -X POST ${{ inputs.webhook-url }} -H 'Content-Type: application/json' -d '{ text: "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|spring-boot-${{ github.ref_name }} ${{ github.job }} was cancalled>"}' || true + curl -X POST ${{ inputs.webhook-url }} -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was cancalled"}' || true diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index aa1f3bfa738..f6454145d0e 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -7,7 +7,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} jobs: build: - name: 'Java 17 | Windows' + name: 'Windows | Java 17' runs-on: 'windows-latest' if: ${{ github.repository == 'spring-projects/spring-boot' }} steps: @@ -53,3 +53,4 @@ jobs: with: webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }} build-scan-url: ${{ steps.build.outputs.build-scan-url }} + run-name: ${{ format('{0} | Windows | Java 17', github.ref_name) }}