mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '3.1.x' into 3.2.x
This commit is contained in:
commit
72940cf997
16
.github/workflows/build-and-deploy-snapshot.yml
vendored
16
.github/workflows/build-and-deploy-snapshot.yml
vendored
@ -1,4 +1,4 @@
|
|||||||
name: Build and deploy snapshot
|
name: Build and Deploy Snapshot
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
@ -11,14 +11,14 @@ jobs:
|
|||||||
name: Build and Deploy Snapshot
|
name: Build and Deploy Snapshot
|
||||||
runs-on: ubuntu22-8-32
|
runs-on: ubuntu22-8-32
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Java
|
- name: Set Up Java
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'liberica'
|
distribution: 'liberica'
|
||||||
java-version: 17
|
java-version: 17
|
||||||
- name: Checkout
|
- name: Check Out
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Set up Gradle
|
- name: Set Up Gradle
|
||||||
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
|
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
|
||||||
with:
|
with:
|
||||||
cache-read-only: false
|
cache-read-only: false
|
||||||
@ -73,23 +73,23 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: build-and-deploy-snapshot
|
needs: build-and-deploy-snapshot
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Release Verification Tests
|
- name: Check Out Release Verification Tests
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: spring-projects/spring-boot-release-verification
|
repository: spring-projects/spring-boot-release-verification
|
||||||
ref: 'main'
|
ref: 'main'
|
||||||
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
|
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
|
||||||
- name: Checkout Send Notification Action
|
- name: Check Out Send Notification Action
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: spring-boot
|
path: spring-boot
|
||||||
sparse-checkout: .github/actions/send-notification
|
sparse-checkout: .github/actions/send-notification
|
||||||
- name: Setup Java
|
- name: Set Up Java
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'liberica'
|
distribution: 'liberica'
|
||||||
java-version: 17
|
java-version: 17
|
||||||
- name: Setup Gradle
|
- name: Set Up Gradle
|
||||||
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
|
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
|
||||||
with:
|
with:
|
||||||
cache-read-only: false
|
cache-read-only: false
|
||||||
|
6
.github/workflows/build-pull-request.yml
vendored
6
.github/workflows/build-pull-request.yml
vendored
@ -10,16 +10,16 @@ jobs:
|
|||||||
runs-on: ubuntu22-8-32
|
runs-on: ubuntu22-8-32
|
||||||
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Setup JDK 17
|
- name: Set Up JDK 17
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '17'
|
java-version: '17'
|
||||||
distribution: 'liberica'
|
distribution: 'liberica'
|
||||||
- name: Checkout
|
- name: Check Out
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92
|
uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92
|
||||||
- name: Setup Gradle
|
- name: Set Up Gradle
|
||||||
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
|
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
|
||||||
- name: Build
|
- name: Build
|
||||||
env:
|
env:
|
||||||
|
12
.github/workflows/ci.yml
vendored
12
.github/workflows/ci.yml
vendored
@ -30,7 +30,7 @@ jobs:
|
|||||||
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
|
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
|
||||||
runs-on: ${{ matrix.os.id }}
|
runs-on: ${{ matrix.os.id }}
|
||||||
steps:
|
steps:
|
||||||
- name: Set up Java
|
- name: Set Up Java
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: liberica
|
distribution: liberica
|
||||||
@ -43,20 +43,20 @@ jobs:
|
|||||||
git config --global core.autocrlf true
|
git config --global core.autocrlf true
|
||||||
git config --global core.longPaths true
|
git config --global core.longPaths true
|
||||||
Stop-Service -name Docker
|
Stop-Service -name Docker
|
||||||
- name: Check out code
|
- name: Check Out Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Set up Gradle
|
- name: Set Up Gradle
|
||||||
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
|
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
|
||||||
with:
|
with:
|
||||||
cache-read-only: false
|
cache-read-only: false
|
||||||
- name: Configure Gradle properties
|
- name: Configure Gradle Properties
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
mkdir -p $HOME/.gradle
|
mkdir -p $HOME/.gradle
|
||||||
echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
|
echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
|
||||||
echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $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
|
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
|
||||||
- name: Configure toolchain properties
|
- name: Configure Toolchain Properties
|
||||||
if: ${{ matrix.java.toolchain }}
|
if: ${{ matrix.java.toolchain }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
@ -73,7 +73,7 @@ jobs:
|
|||||||
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
|
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
|
||||||
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
|
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
|
||||||
run: ./gradlew build
|
run: ./gradlew build
|
||||||
- name: Send notification
|
- name: Send Notification
|
||||||
uses: ./.github/actions/send-notification
|
uses: ./.github/actions/send-notification
|
||||||
if: always()
|
if: always()
|
||||||
with:
|
with:
|
||||||
|
Loading…
Reference in New Issue
Block a user