Browse Source

Merge branch '3.2.x' into 3.3.x

pull/42700/head
Phillip Webb 1 year ago
parent
commit
75bea6baf1
  1. 2
      .github/workflows/build-and-deploy-snapshot.yml
  2. 2
      .github/workflows/build-pull-request.yml
  3. 2
      .github/workflows/ci.yml
  4. 14
      .github/workflows/release.yml
  5. 2
      .github/workflows/run-system-tests.yml
  6. 2
      .github/workflows/trigger-docs-build.yml
  7. 2
      .github/workflows/verify.yml

2
.github/workflows/build-and-deploy-snapshot.yml

@ -8,7 +8,7 @@ concurrency: @@ -8,7 +8,7 @@ concurrency:
jobs:
build-and-deploy-snapshot:
name: Build and Deploy Snapshot
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
if: ${{ github.repository == 'spring-projects/spring-boot' }}
steps:
- name: Check Out Code

2
.github/workflows/build-pull-request.yml

@ -7,7 +7,7 @@ permissions: @@ -7,7 +7,7 @@ permissions:
jobs:
build:
name: Build Pull Request
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
if: ${{ github.repository == 'spring-projects/spring-boot' }}
steps:
- name: Free Disk Space

2
.github/workflows/ci.yml

@ -14,7 +14,7 @@ jobs: @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os:
- id: ubuntu-latest
- id: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
name: Linux
- id: windows-latest
name: Windows

14
.github/workflows/release.yml

@ -8,7 +8,7 @@ concurrency: @@ -8,7 +8,7 @@ concurrency:
jobs:
build-and-stage-release:
name: Build and Stage Release
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_MEDIUIM || 'ubuntu-latest' }}
if: ${{ github.repository == 'spring-projects/spring-boot' }}
steps:
- name: Check Out Code
@ -49,7 +49,7 @@ jobs: @@ -49,7 +49,7 @@ jobs:
needs:
- build-and-stage-release
- verify
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Check Out Code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@ -66,7 +66,7 @@ jobs: @@ -66,7 +66,7 @@ jobs:
needs:
- build-and-stage-release
- sync-to-maven-central
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Set up JFrog CLI
uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
@ -79,7 +79,7 @@ jobs: @@ -79,7 +79,7 @@ jobs:
needs:
- build-and-stage-release
- sync-to-maven-central
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Check Out Code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@ -95,7 +95,7 @@ jobs: @@ -95,7 +95,7 @@ jobs:
needs:
- build-and-stage-release
- sync-to-maven-central
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Check Out Code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@ -111,7 +111,7 @@ jobs: @@ -111,7 +111,7 @@ jobs:
needs:
- build-and-stage-release
- sync-to-maven-central
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Check Out Code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@ -128,7 +128,7 @@ jobs: @@ -128,7 +128,7 @@ jobs:
- publish-gradle-plugin
- publish-to-sdkman
- update-homebrew-tap
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Check Out Code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

2
.github/workflows/run-system-tests.yml

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

2
.github/workflows/trigger-docs-build.yml

@ -8,7 +8,7 @@ permissions: @@ -8,7 +8,7 @@ permissions:
jobs:
trigger-docs-build:
name: Trigger Docs Build
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
if: github.repository_owner == 'spring-projects'
steps:
- name: Check Out

2
.github/workflows/verify.yml

@ -21,7 +21,7 @@ on: @@ -21,7 +21,7 @@ on:
jobs:
verify:
name: Verify
runs-on: ubuntu-latest
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Check Out Release Verification Tests
uses: actions/checkout@v4

Loading…
Cancel
Save