Browse Source

Merge branch '3.4.x' into 3.5.x

Closes gh-47937
pull/47987/head
Andy Wilkinson 1 month ago
parent
commit
e02804c215
  1. 3
      .github/workflows/build-and-deploy-snapshot.yml
  2. 3
      .github/workflows/release.yml

3
.github/workflows/build-and-deploy-snapshot.yml

@ -28,7 +28,7 @@ jobs: @@ -28,7 +28,7 @@ jobs:
gradle-cache-read-only: false
publish: true
- name: Deploy
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
with:
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '3.5.x') || format('spring-boot-{0}', '3.5.x') }}
folder: 'deployment-repository'
@ -37,6 +37,7 @@ jobs: @@ -37,6 +37,7 @@ jobs:
repository: ${{ vars.COMMERCIAL && 'spring-enterprise-maven-dev-local' || 'libs-snapshot-local' }}
signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
threads: 8
uri: ${{ vars.COMMERCIAL_DEPLOY_REPO_URL || 'https://repo.spring.io' }}
username: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_USERNAME || secrets.ARTIFACTORY_USERNAME }}
- name: Send Notification

3
.github/workflows/release.yml

@ -27,7 +27,7 @@ jobs: @@ -27,7 +27,7 @@ jobs:
gradle-cache-read-only: false
publish: true
- name: Stage Release
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
with:
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', steps.build-and-publish.outputs.version) || format('spring-boot-{0}', steps.build-and-publish.outputs.version) }}
folder: 'deployment-repository'
@ -36,6 +36,7 @@ jobs: @@ -36,6 +36,7 @@ jobs:
repository: ${{ vars.COMMERCIAL && 'spring-enterprise-maven-stage-local' || 'libs-staging-local' }}
signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
threads: 8
uri: ${{ vars.COMMERCIAL_DEPLOY_REPO_URL || 'https://repo.spring.io' }}
username: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_USERNAME || secrets.ARTIFACTORY_USERNAME }}
- name: Send Notification

Loading…
Cancel
Save