Merge branch '3.1.x' into 3.2.x
Closes gh-40706
This commit is contained in:
@@ -12,6 +12,12 @@ inputs:
|
|||||||
runs:
|
runs:
|
||||||
using: composite
|
using: composite
|
||||||
steps:
|
steps:
|
||||||
|
- name: Free Disk Space
|
||||||
|
if: ${{ runner.os == 'Linux' }}
|
||||||
|
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
|
||||||
|
with:
|
||||||
|
large-packages: false
|
||||||
|
docker-images: false
|
||||||
- name: Set Up Java
|
- name: Set Up Java
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
build-and-deploy-snapshot:
|
build-and-deploy-snapshot:
|
||||||
name: Build and Deploy Snapshot
|
name: Build and Deploy Snapshot
|
||||||
runs-on: ubuntu22-8-32-OSS
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check Out Code
|
- name: Check Out Code
|
||||||
|
|||||||
7
.github/workflows/build-pull-request.yml
vendored
7
.github/workflows/build-pull-request.yml
vendored
@@ -7,9 +7,14 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build Pull Request
|
name: Build Pull Request
|
||||||
runs-on: ubuntu22-8-32-OSS
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
||||||
steps:
|
steps:
|
||||||
|
- name: Free Disk Space
|
||||||
|
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
|
||||||
|
with:
|
||||||
|
large-packages: false
|
||||||
|
docker-images: false
|
||||||
- name: Set Up JDK 17
|
- name: Set Up JDK 17
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -13,7 +13,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os:
|
os:
|
||||||
- id: ubuntu22-8-32-OSS
|
- id: ubuntu-latest
|
||||||
name: Linux
|
name: Linux
|
||||||
- id: windows-latest
|
- id: windows-latest
|
||||||
name: Windows
|
name: Windows
|
||||||
|
|||||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
|||||||
build-and-stage-release:
|
build-and-stage-release:
|
||||||
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
||||||
name: Build and Stage Release
|
name: Build and Stage Release
|
||||||
runs-on: ubuntu22-8-32-OSS
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check Out Code
|
- name: Check Out Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|||||||
2
.github/workflows/run-system-tests.yml
vendored
2
.github/workflows/run-system-tests.yml
vendored
@@ -8,7 +8,7 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
run-system-tests:
|
run-system-tests:
|
||||||
name: 'Java ${{ matrix.java.version}}'
|
name: 'Java ${{ matrix.java.version}}'
|
||||||
runs-on: ubuntu22-8-32-OSS
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
if: ${{ github.repository == 'spring-projects/spring-boot' }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
|||||||
Reference in New Issue
Block a user