Skip to content

Commit 75bea6b

Browse files
committed
Merge branch '3.2.x' into 3.3.x
2 parents bdbd006 + cad5dd2 commit 75bea6b

7 files changed

+13
-13
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
jobs:
99
build-and-deploy-snapshot:
1010
name: Build and Deploy Snapshot
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1212
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1313
steps:
1414
- name: Check Out Code

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77
jobs:
88
build:
99
name: Build Pull Request
10-
runs-on: ubuntu-latest
10+
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1111
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1212
steps:
1313
- name: Free Disk Space

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os:
17-
- id: ubuntu-latest
17+
- id: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1818
name: Linux
1919
- id: windows-latest
2020
name: Windows

.github/workflows/release.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
jobs:
99
build-and-stage-release:
1010
name: Build and Stage Release
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ vars.UBUNTU_MEDIUIM || 'ubuntu-latest' }}
1212
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1313
steps:
1414
- name: Check Out Code
@@ -49,7 +49,7 @@ jobs:
4949
needs:
5050
- build-and-stage-release
5151
- verify
52-
runs-on: ubuntu-latest
52+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
5353
steps:
5454
- name: Check Out Code
5555
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -66,7 +66,7 @@ jobs:
6666
needs:
6767
- build-and-stage-release
6868
- sync-to-maven-central
69-
runs-on: ubuntu-latest
69+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
7070
steps:
7171
- name: Set up JFrog CLI
7272
uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
@@ -79,7 +79,7 @@ jobs:
7979
needs:
8080
- build-and-stage-release
8181
- sync-to-maven-central
82-
runs-on: ubuntu-latest
82+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
8383
steps:
8484
- name: Check Out Code
8585
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -95,7 +95,7 @@ jobs:
9595
needs:
9696
- build-and-stage-release
9797
- sync-to-maven-central
98-
runs-on: ubuntu-latest
98+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
9999
steps:
100100
- name: Check Out Code
101101
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -111,7 +111,7 @@ jobs:
111111
needs:
112112
- build-and-stage-release
113113
- sync-to-maven-central
114-
runs-on: ubuntu-latest
114+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
115115
steps:
116116
- name: Check Out Code
117117
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -128,7 +128,7 @@ jobs:
128128
- publish-gradle-plugin
129129
- publish-to-sdkman
130130
- update-homebrew-tap
131-
runs-on: ubuntu-latest
131+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
132132
steps:
133133
- name: Check Out Code
134134
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
jobs:
99
run-system-tests:
1010
name: 'Java ${{ matrix.java.version}}'
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1212
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1313
strategy:
1414
matrix:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88
jobs:
99
trigger-docs-build:
1010
name: Trigger Docs Build
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
1212
if: github.repository_owner == 'spring-projects'
1313
steps:
1414
- name: Check Out

.github/workflows/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
jobs:
2222
verify:
2323
name: Verify
24-
runs-on: ubuntu-latest
24+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
2525
steps:
2626
- name: Check Out Release Verification Tests
2727
uses: actions/checkout@v4

0 commit comments

Comments
 (0)