From 7149622efd8a3b983f5111028755b18a6025df43 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg <5248162+sjohnr@users.noreply.github.com> Date: Fri, 9 Aug 2024 10:37:37 -0500 Subject: [PATCH] Revert "Migrate slack notifications to GChat" This reverts commits: - 5d335ccf8dd23472c6fd37c42a3d04d7f97074de - a5b1dec99a463918711b0466ccb725294b8726d5 --- .../continuous-integration-workflow.yml | 45 +++++++++++++------ .../milestone-spring-releasetrain.yml | 22 ++++----- .../update-scheduled-release-version.yml | 14 +++--- 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index acd0fd3995..2bc4774549 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -209,11 +209,26 @@ jobs: run: | echo "Tagging and publishing $REPO@$VERSION release on GitHub." ./gradlew createGitHubRelease -PnextVersion=$VERSION -Pbranch=$BRANCH -PcreateRelease=true -PgitHubAccessToken=$TOKEN - - name: Announce Release on GChat + - name: Announce Release on Slack + id: spring-security-announcing + uses: slackapi/slack-github-action@v1.26.0 + with: + payload: | + { + "text": "spring-security-announcing `${{ env.VERSION }}` is available now", + "blocks": [ + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": "spring-security-announcing `${{ env.VERSION }}` is available now" + } + } + ] + } env: - WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }} - run: | - curl -X POST '$WEBHOOK_URL' -H 'Content-Type: application/json' -d '{ text: "spring-security-announcing `$VERSION` is available now" }' || true + SLACK_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_SLACK_WEBHOOK_URL }} + SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK - name: Setup git config run: | git config user.name 'github-actions[bot]' @@ -245,16 +260,20 @@ jobs: distribution: 'adopt' - name: Schedule next release (if not already scheduled) run: ./gradlew scheduleNextRelease -PnextVersion=$VERSION -PgitHubAccessToken=$TOKEN - send-notification: - name: Send Notification - needs: [ perform_release, perform_post_release ] + notify_result: + name: Check for failures + needs: [perform_release, perform_post_release] if: failure() runs-on: ubuntu-latest + permissions: + actions: read steps: - - name: Send Notification - uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 + - name: Send Slack message + # Workaround while waiting for Gamesight/slack-workflow-status#38 to be fixed + # See https://github.com/Gamesight/slack-workflow-status/issues/38 + uses: sjohnr/slack-workflow-status@v1-beta with: - webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} - status: ${{ job.status }} - build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} - run-name: ${{ format('spring-security/{0}', github.ref_name) }} + repo_token: ${{ secrets.GITHUB_TOKEN }} + slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }} + channel: '#spring-security-ci' + name: 'CI Notifier' diff --git a/.github/workflows/milestone-spring-releasetrain.yml b/.github/workflows/milestone-spring-releasetrain.yml index 44a2c11356..87d1ab287e 100644 --- a/.github/workflows/milestone-spring-releasetrain.yml +++ b/.github/workflows/milestone-spring-releasetrain.yml @@ -8,7 +8,7 @@ env: permissions: contents: read jobs: - spring-releasetrain-checks: + spring-releasetrain-checks: name: Check DueOn is on a Release Date runs-on: ubuntu-latest if: ${{ github.repository == 'spring-projects/spring-security' }} @@ -23,16 +23,18 @@ jobs: export TOOL_VERSION=0.1.1 wget "https://repo.maven.apache.org/maven2/io/spring/releasetrain/spring-release-train-tools/$TOOL_VERSION/spring-release-train-tools-$TOOL_VERSION.jar" java -cp "spring-release-train-tools-$TOOL_VERSION.jar" io.spring.releasetrain.CheckMilestoneDueOnMain --dueOn "$DUE_ON" --expectedDayOfWeek MONDAY --expectedMondayCount 3 - send-notification: - name: Send Notification - needs: [ spring-releasetrain-checks ] + notify_result: + name: Check for failures + needs: [spring-releasetrain-checks] if: failure() runs-on: ubuntu-latest + permissions: + actions: read steps: - - name: Send Notification - uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 + - name: Send Slack message + uses: Gamesight/slack-workflow-status@v1.3.0 with: - webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} - status: ${{ job.status }} - build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} - run-name: ${{ format('spring-security/{0}', github.ref_name) }} + repo_token: ${{ secrets.GITHUB_TOKEN }} + slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }} + channel: '#spring-security-ci' + name: 'CI Notifier' diff --git a/.github/workflows/update-scheduled-release-version.yml b/.github/workflows/update-scheduled-release-version.yml index 3cde9b5e81..0453acee62 100644 --- a/.github/workflows/update-scheduled-release-version.yml +++ b/.github/workflows/update-scheduled-release-version.yml @@ -4,6 +4,7 @@ on: workflow_dispatch: # Manual trigger only. Triggered by release-scheduler.yml on main. env: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} permissions: @@ -57,11 +58,12 @@ jobs: git tag $updatedVersion git push git push origin $updatedVersion - - name: Send Notification + - id: send-slack-notification + name: Send Slack message if: failure() - uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 + uses: Gamesight/slack-workflow-status@v1.3.0 with: - webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} - status: ${{ job.status }} - build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} - run-name: ${{ format('spring-security/{0}', github.ref_name) }} + repo_token: ${{ secrets.GITHUB_TOKEN }} + slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }} + channel: '#spring-security-ci' + name: 'CI Notifier'