Merge branch '3.1.x' into 3.2.x

Closes gh-40706
This commit is contained in:
Andy Wilkinson 2024-05-13 12:12:47 +01:00
commit ccd573ad3d
6 changed files with 16 additions and 5 deletions

View File

@ -12,6 +12,12 @@ inputs:
runs:
using: composite
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
uses: actions/setup-java@v4
with:

View File

@ -8,7 +8,7 @@ concurrency:
jobs:
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' }}
steps:
- name: Check Out Code

View File

@ -7,9 +7,14 @@ permissions:
jobs:
build:
name: Build Pull Request
runs-on: ubuntu22-8-32-OSS
runs-on: ubuntu-latest
if: ${{ github.repository == 'spring-projects/spring-boot' }}
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
uses: actions/setup-java@v4
with:

View File

@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os:
- id: ubuntu22-8-32-OSS
- id: ubuntu-latest
name: Linux
- id: windows-latest
name: Windows

View File

@ -9,7 +9,7 @@ jobs:
build-and-stage-release:
if: ${{ github.repository == 'spring-projects/spring-boot' }}
name: Build and Stage Release
runs-on: ubuntu22-8-32-OSS
runs-on: ubuntu-latest
steps:
- name: Check Out Code
uses: actions/checkout@v4

View File

@ -8,7 +8,7 @@ concurrency:
jobs:
run-system-tests:
name: 'Java ${{ matrix.java.version}}'
runs-on: ubuntu22-8-32-OSS
runs-on: ubuntu-latest
if: ${{ github.repository == 'spring-projects/spring-boot' }}
strategy:
matrix: