From 98edcaa0eba8892b45fc630207fb62e28ff924e7 Mon Sep 17 00:00:00 2001 From: Asutosh Panda Date: Fri, 29 Aug 2025 00:29:24 +0530 Subject: [PATCH 1/3] build-and-deploy-snapshot: test gh runners --- .../workflows/build-and-deploy-snapshot.yml | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 74ede1f31c32..5a9032d041b6 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -1,9 +1,5 @@ name: Build and Deploy Snapshot -on: - workflow_dispatch: - push: - branches: - - 'main' +on: pull_request permissions: contents: read concurrency: @@ -39,14 +35,14 @@ jobs: signing-passphrase: ${{ secrets.GPG_PASSPHRASE }} uri: ${{ vars.COMMERCIAL_DEPLOY_REPO_URL || 'https://repo.spring.io' }} username: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_USERNAME || secrets.ARTIFACTORY_USERNAME }} - - name: Send Notification - if: always() - uses: ./.github/actions/send-notification - with: - build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} - run-name: ${{ format('{0} | Linux | Java 24', github.ref_name) }} - status: ${{ job.status }} - webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }} + # - name: Send Notification + # if: always() + # uses: ./.github/actions/send-notification + # with: + # build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} + # run-name: ${{ format('{0} | Linux | Java 24', github.ref_name) }} + # status: ${{ job.status }} + # webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }} outputs: version: ${{ steps.build-and-publish.outputs.version }} trigger-docs-build: @@ -60,16 +56,16 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: gh workflow run deploy-docs.yml --repo ${{ github.repository }} -r docs-build -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }} - verify: - name: Verify - needs: build-and-deploy-snapshot - uses: ./.github/workflows/verify.yml - secrets: - commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }} - commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }} - google-chat-webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }} - opensource-repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }} - opensource-repository-username: ${{ secrets.ARTIFACTORY_USERNAME }} - token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} - with: - version: ${{ needs.build-and-deploy-snapshot.outputs.version }} + # verify: + # name: Verify + # needs: build-and-deploy-snapshot + # uses: ./.github/workflows/verify.yml + # secrets: + # commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }} + # commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }} + # google-chat-webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }} + # opensource-repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }} + # opensource-repository-username: ${{ secrets.ARTIFACTORY_USERNAME }} + # token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} + # with: + # version: ${{ needs.build-and-deploy-snapshot.outputs.version }} From 80cea02cb597e4ad36bcc93c2866e809a11adf11 Mon Sep 17 00:00:00 2001 From: Asutosh Panda Date: Fri, 29 Aug 2025 00:31:52 +0530 Subject: [PATCH 2/3] build-and-deploy-snapshot: test gh runners, bypass conditions to pass the run --- .github/workflows/build-and-deploy-snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 5a9032d041b6..2488aceb045d 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -7,7 +7,7 @@ concurrency: jobs: build-and-deploy-snapshot: name: Build and Deploy Snapshot - if: ${{ github.repository == 'spring-projects/spring-boot' || github.repository == 'spring-projects/spring-boot-commercial' }} + # if: ${{ github.repository == 'spring-projects/spring-boot' || github.repository == 'spring-projects/spring-boot-commercial' }} runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} steps: - name: Check Out Code From 4ab98851d3b3587b1a7c814f0cd59535cbdff17d Mon Sep 17 00:00:00 2001 From: Asutosh Panda Date: Fri, 29 Aug 2025 00:48:58 +0530 Subject: [PATCH 3/3] build-and-deploy-snapshot: test gh runners, bypass conditions to pass the run --- .../workflows/build-and-deploy-snapshot.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 2488aceb045d..1928ffdd3f72 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -23,18 +23,18 @@ jobs: develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} gradle-cache-read-only: false publish: true - - name: Deploy - uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2 - with: - build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x') || format('spring-boot-{0}', '4.0.x') }} - folder: 'deployment-repository' - password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }} - project: ${{ vars.COMMERCIAL && 'spring' }} - repository: ${{ vars.COMMERCIAL && 'spring-enterprise-maven-dev-local' || 'libs-snapshot-local' }} - signing-key: ${{ secrets.GPG_PRIVATE_KEY }} - signing-passphrase: ${{ secrets.GPG_PASSPHRASE }} - uri: ${{ vars.COMMERCIAL_DEPLOY_REPO_URL || 'https://repo.spring.io' }} - username: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_USERNAME || secrets.ARTIFACTORY_USERNAME }} + # - name: Deploy + # uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2 + # with: + # build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x') || format('spring-boot-{0}', '4.0.x') }} + # folder: 'deployment-repository' + # password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }} + # project: ${{ vars.COMMERCIAL && 'spring' }} + # repository: ${{ vars.COMMERCIAL && 'spring-enterprise-maven-dev-local' || 'libs-snapshot-local' }} + # signing-key: ${{ secrets.GPG_PRIVATE_KEY }} + # signing-passphrase: ${{ secrets.GPG_PASSPHRASE }} + # uri: ${{ vars.COMMERCIAL_DEPLOY_REPO_URL || 'https://repo.spring.io' }} + # username: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_USERNAME || secrets.ARTIFACTORY_USERNAME }} # - name: Send Notification # if: always() # uses: ./.github/actions/send-notification