root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Brian Clozel 2024-04-29 13:40:51 +02:00
parent fc3dddac9c 370a4ee8b3
commit 65f118bdec
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-and-deploy-snapshot.yml vendored
View File

@ -35,9 +35,7 @@ jobs:
env: env:
CI: 'true' CI: 'true'
GRADLE_ENTERPRISE_URL: 'https://ge.spring.io' GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository build publishAllPublicationsToDeploymentRepository run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository build publishAllPublicationsToDeploymentRepository
- name: Deploy - name: Deploy
uses: spring-io/artifactory-deploy-action@v0.0.1 uses: spring-io/artifactory-deploy-action@v0.0.1

4
.github/workflows/ci.yml vendored
View File

@ -65,9 +65,7 @@ jobs:
env: env:
CI: 'true' CI: 'true'
GRADLE_ENTERPRISE_URL: 'https://ge.spring.io' GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
run: ./gradlew check antora run: ./gradlew check antora
- name: Send notification - name: Send notification
uses: ./.github/actions/send-notification uses: ./.github/actions/send-notification

4
ci/pipeline.yml
View File

@ -5,9 +5,7 @@ anchors:
password: ((github-ci-release-token)) password: ((github-ci-release-token))
branch: ((branch)) branch: ((branch))
gradle-enterprise-task-params: &gradle-enterprise-task-params gradle-enterprise-task-params: &gradle-enterprise-task-params
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) DEVELOCITY_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
sonatype-task-params: &sonatype-task-params sonatype-task-params: &sonatype-task-params
SONATYPE_USERNAME: ((sonatype-username)) SONATYPE_USERNAME: ((sonatype-username))
SONATYPE_PASSWORD: ((sonatype-password)) SONATYPE_PASSWORD: ((sonatype-password))

4
settings.gradle
View File

@ -1,6 +1,6 @@
plugins { plugins {
id "com.gradle.enterprise" version "3.16.2" id "com.gradle.develocity" version "3.17.2"
id "io.spring.ge.conventions" version "0.0.15" id "io.spring.ge.conventions" version "0.0.17"
id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0" id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0"
} }