Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Phillip Webb 2024-03-27 12:53:19 -07:00
commit f5e2009988
2 changed files with 3 additions and 4 deletions

View File

@ -7,10 +7,9 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
jobs:
build-and-deploy-snapshot:
name: Build and Deploy Snapshot
if: ${{ github.repository == 'spring-projects/spring-boot' }}
name: Build and Deploy Snapshot
runs-on: ubuntu22-8-32
if: ${{ github.repository == 'spring-projects/spring-boot' }}
steps:
- name: Set Up Java
uses: actions/setup-java@v4

View File

@ -7,6 +7,8 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
jobs:
ci:
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
runs-on: ${{ matrix.os.id }}
if: ${{ github.repository == 'spring-projects/spring-boot' }}
strategy:
matrix:
@ -27,8 +29,6 @@ jobs:
name: Linux
java:
version: 17
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
runs-on: ${{ matrix.os.id }}
steps:
- name: Set Up Java
uses: actions/setup-java@v4