Merge branch '3.2.x'

This commit is contained in:
Phillip Webb 2024-03-27 11:43:10 -07:00
commit 9b17c27d0d
4 changed files with 23 additions and 31 deletions

View File

@ -1,4 +1,4 @@
name: Send notification
name: Send Notification
description: Sends a Google Chat message as a notification of the job's outcome
inputs:
webhook-url:

View File

@ -8,28 +8,28 @@ concurrency:
jobs:
build-and-deploy-snapshot:
if: ${{ github.repository == 'spring-projects/spring-boot' }}
name: Build and deploy snapshot
name: Build and Deploy Snapshot
runs-on: ubuntu22-8-32
steps:
- name: Set up Java
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'liberica'
java-version: 17
- name: Check out code
- name: Checkout
uses: actions/checkout@v4
- name: Set up Gradle
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
with:
cache-read-only: false
- name: Configure Gradle properties
- name: Configure Gradle Properties
shell: bash
run: |
mkdir -p $HOME/.gradle
echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
- name: Build and publish
- name: Build and Publish
id: build
env:
CI: 'true'
@ -51,7 +51,7 @@ jobs:
signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
artifact-properties: |
/**/spring-boot-docs-*.zip::zip.type=docs,zip.deployed=false
- name: Send notification
- name: Send Notification
uses: ./.github/actions/send-notification
if: always()
with:
@ -59,7 +59,7 @@ jobs:
status: ${{ job.status }}
build-scan-url: ${{ steps.build.outputs.build-scan-url }}
run-name: ${{ format('{0} | Linux | Java 17', github.ref_name) }}
- name: Read version from gradle.properties
- name: Read Version From gradle.properties
id: read-version
shell: bash
run: |
@ -73,43 +73,43 @@ jobs:
runs-on: ubuntu-latest
needs: build-and-deploy-snapshot
steps:
- name: Check out release verification tests
- name: Checkout Release Verification Tests
uses: actions/checkout@v4
with:
repository: spring-projects/spring-boot-release-verification
ref: 'main'
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
- name: Check out send notification action
- name: Checkout Send Notification Action
uses: actions/checkout@v4
with:
path: spring-boot
sparse-checkout: .github/actions/send-notification
- name: Set up Java
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'liberica'
java-version: 17
- name: Set up Gradle
- name: Setup Gradle
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
with:
cache-read-only: false
- name: Configure Gradle properties
- name: Configure Gradle Properties
shell: bash
run: |
mkdir -p $HOME/.gradle
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
- name: Run release verification tests
- name: Run Release Verification Tests
env:
RVT_VERSION: ${{ needs.build-and-deploy-snapshot.outputs.version }}
RVT_RELEASE_TYPE: oss
run: ./gradlew spring-boot-release-verification-tests:test
- name: Upload build reports on failure
- name: Upload Build Reports on Failure
uses: actions/upload-artifact@v4
if: failure()
with:
name: build-reports
path: '**/build/reports/'
- name: Send notification
- name: Send Notification
uses: ./spring-boot/.github/actions/send-notification
if: always()
with:

View File

@ -6,36 +6,30 @@ permissions:
jobs:
build:
name: Build pull request
name: Build Pull Request
runs-on: ubuntu22-8-32
if: ${{ github.repository == 'spring-projects/spring-boot' }}
steps:
- name: Set up JDK 17
- name: Setup JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'liberica'
- name: Check out code
- name: Checkout
uses: actions/checkout@v4
- name: Validate Gradle wrapper
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92
- name: Set up Gradle
- name: Setup Gradle
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
- name: Build
env:
CI: 'true'
GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
run: ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --no-parallel --continue build
- name: Print JVM thread dumps when cancelled
- name: Print JVM Thread Dumps When Cancelled
uses: ./.github/actions/print-jvm-thread-dumps
if: cancelled()
- name: Upload build reports
- name: Upload Build Reports
uses: actions/upload-artifact@v4
if: failure()
with:

View File

@ -1,9 +1,7 @@
name: "Validate Gradle Wrapper"
on: [push, pull_request]
permissions:
contents: read
jobs:
validation:
name: "Validation"