Merge branch '3.2.x'

Closes gh-40685
This commit is contained in:
Phillip Webb 2024-05-09 12:01:05 -07:00
commit e2f3d6a395
5 changed files with 5 additions and 5 deletions

View File

@ -10,7 +10,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 runs-on: ubuntu22-8-32-OSS
if: ${{ github.repository == 'spring-projects/spring-boot' }} if: ${{ github.repository == 'spring-projects/spring-boot' }}
steps: steps:
- name: Check Out Code - name: Check Out Code

View File

@ -7,7 +7,7 @@ permissions:
jobs: jobs:
build: build:
name: Build Pull Request name: Build Pull Request
runs-on: ubuntu22-8-32 runs-on: ubuntu22-8-32-OSS
if: ${{ github.repository == 'spring-projects/spring-boot' }} if: ${{ github.repository == 'spring-projects/spring-boot' }}
steps: steps:
- name: Set Up JDK 17 - name: Set Up JDK 17

View File

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

View File

@ -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 runs-on: ubuntu22-8-32-OSS
steps: steps:
- name: Check Out Code - name: Check Out Code
uses: actions/checkout@v4 uses: actions/checkout@v4

View File

@ -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 runs-on: ubuntu22-8-32-OSS
if: ${{ github.repository == 'spring-projects/spring-boot' }} if: ${{ github.repository == 'spring-projects/spring-boot' }}
strategy: strategy:
matrix: matrix: