Merge branch '3.2.x'

Closes spring-projectsgh-40685
jonatan-ivanov · May 9, 2024 · e2f3d6a · e2f3d6a
2 parents 0ea4da3 + 2d77ebc
commit e2f3d6a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml
@@ -10,7 +10,7 @@ concurrency:
 jobs:
   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' }}
     steps:
       - name: Check Out Code

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - id: ubuntu22-8-32
+          - id: ubuntu22-8-32-OSS
             name: Linux
           - id: windows-latest
             name: Windows

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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
+    runs-on: ubuntu22-8-32-OSS
     steps:
       - name: Check Out Code
         uses: actions/checkout@v4

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