Upgrade to Gradle 8.6; latest reusable workflows

* Add `package-ecosystem: "github-actions"` for Dependabot

**Auto-cherry-pick to `6.2.x`**
This commit is contained in:
Artem Bilan
2024-02-09 16:04:55 -05:00
parent 92cfd0ed05
commit 7f7ec29801
8 changed files with 26 additions and 10 deletions

View File

@@ -41,3 +41,14 @@ updates:
- "org.xmlunit:xmlunit-assertj3"
- "com.thoughtworks.xstream:xstream"
- "org.springframework.security*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "saturday"
labels: ["type: task"]
groups:
development-dependencies:
patterns:
- "*"

View File

@@ -7,6 +7,6 @@ on:
jobs:
backport-issue:
uses: spring-io/spring-github-workflows/.github/workflows/spring-backport-issue.yml@v2
uses: spring-io/spring-github-workflows/.github/workflows/spring-backport-issue.yml@main
secrets:
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

View File

@@ -2,7 +2,7 @@ name: CI SNAPSHOT
on:
workflow_dispatch:
push:
branches:
- main
@@ -17,11 +17,12 @@ concurrency:
jobs:
build-snapshot:
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@v2
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@main
with:
gradleTasks: ${{ github.event_name == 'schedule' && '--rerun-tasks' || '' }}
secrets:
GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}

View File

@@ -16,4 +16,4 @@ permissions:
jobs:
dispatch-docs-build:
if: github.repository_owner == 'spring-projects'
uses: spring-io/spring-github-workflows/.github/workflows/spring-dispatch-docs-build.yml@v2
uses: spring-io/spring-github-workflows/.github/workflows/spring-dispatch-docs-build.yml@main

View File

@@ -11,4 +11,6 @@ jobs:
merge-dependabot-pr:
permissions: write-all
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v2
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@main
with:
mergeArguments: --auto --squash

View File

@@ -7,4 +7,4 @@ on:
jobs:
build-pull-request:
uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@v2
uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@main

View File

@@ -12,13 +12,15 @@ jobs:
contents: write
issues: write
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@v2
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
secrets:
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
OSSRH_URL: ${{ secrets.OSSRH_URL }}
OSSRH_S01_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
OSSRH_S01_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}

View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME