From b8adc23f87885c0f952055bc915d4e04db7233d3 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Tue, 10 Sep 2024 21:39:18 -0500 Subject: [PATCH] Update Develocity access key vars (#838) Replaces - GRADLE_ENTERPRISE_CACHE_USER - GRADLE_ENTERPRISE_CACHE_PASSWORD - GRADLE_ENTERPRISE_CACHE_PASSWORD with - DEVELOCITY_ACCESS_KEY (cherry picked from commit 82e3e7a44314b6a12b9c97c06713bf82c8ddbb8f) --- .github/workflows/central-release.yml | 4 +--- .github/workflows/check-samples.yml | 4 +--- .github/workflows/ci.yml | 33 ++++++++------------------- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/.github/workflows/central-release.yml b/.github/workflows/central-release.yml index 5863bbac..2d21a0b1 100644 --- a/.github/workflows/central-release.yml +++ b/.github/workflows/central-release.yml @@ -4,9 +4,7 @@ on: workflow_dispatch: env: - GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} jobs: release_sonatype_repo: diff --git a/.github/workflows/check-samples.yml b/.github/workflows/check-samples.yml index 1c44e9dd..2f01cc44 100644 --- a/.github/workflows/check-samples.yml +++ b/.github/workflows/check-samples.yml @@ -5,9 +5,7 @@ on: env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} COMMIT_OWNER: ${{ github.event.pusher.name }} COMMIT_SHA: ${{ github.sha }} ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba321132..b3be3c58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,8 @@ on: workflow_dispatch: env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + GCHAT_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} COMMIT_OWNER: ${{ github.event.pusher.name }} COMMIT_SHA: ${{ github.sha }} ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} @@ -87,6 +85,7 @@ jobs: -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" \ -PspringPulsarVersion="$VERSION" \ -PspringBootVersion="$BOOT_VERSION" \ + -PsampleTests \ :runAllSampleTests scan: needs: [prerequisites] @@ -185,7 +184,7 @@ jobs: git push --tags origin - name: Install tooling for Github release run: | - curl -sSL -O https://github.com/spring-io/github-changelog-generator/releases/download/v0.0.8/github-changelog-generator.jar + curl -sSL -O https://github.com/spring-io/github-changelog-generator/releases/download/v0.0.10/github-changelog-generator.jar - name: Create Github release env: RELEASE_NOTES_FILE: ${{runner.temp}}/release_notes.md5 @@ -200,26 +199,12 @@ jobs: --title "Spring Pulsar $VERSION" \ --generate-notes \ --notes-file $RELEASE_NOTES_FILE - - name: Announce Release on Slack - id: spring-pulsar-announcing - uses: slackapi/slack-github-action@v1.27.0 + - name: Announce Release in Chat + uses: julb/action-post-googlechat-message@v1 + if: env.GCHAT_WEBHOOK_URL with: - payload: | - { - "text": "spring-pulsar-announcing `${{ env.VERSION }}` is available now", - "blocks": [ - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "spring-pulsar-announcing `${{ env.VERSION }}` is available now" - } - } - ] - } - env: - SLACK_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_SLACK_WEBHOOK_URL }} - SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK + message: "spring-pulsar-announcing `${{ env.VERSION }}`" + gchat_webhook_url: ${{ env.GCHAT_WEBHOOK_URL }} - name: Update next snapshot version run: | echo "Updating $REPO@$VERSION to next snapshot version."