From cad5dd2b852500df3374a5e0521599978c2910b1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 17 Sep 2024 12:25:54 -0700 Subject: [PATCH] Use variables for `runs-on` settings See gh-42333 --- .github/workflows/build-and-deploy-snapshot.yml | 2 +- .github/workflows/build-pull-request.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 12 ++++++------ .github/workflows/run-system-tests.yml | 2 +- .github/workflows/verify.yml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index f2d5ebeb5a..c429887ad6 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -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 diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 04cc8240b1..96667f8684 100644 --- 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: ubuntu-latest + runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} if: ${{ github.repository == 'spring-projects/spring-boot' }} steps: - name: Free Disk Space diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 447e2be2e9..c3a4e83ec5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ecd0147c10..c36467b686 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -51,7 +51,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 @@ -68,7 +68,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 @@ -81,7 +81,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 @@ -97,7 +97,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 @@ -115,7 +115,7 @@ jobs: - promote-release - publish-gradle-plugin - publish-to-sdkman - runs-on: ubuntu-latest + runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }} steps: - name: Check Out Code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/run-system-tests.yml b/.github/workflows/run-system-tests.yml index 927437ee3f..43641898b1 100644 --- 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: ubuntu-latest + runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} if: ${{ github.repository == 'spring-projects/spring-boot' }} strategy: matrix: diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 01cd02e973..ca8b9fb09e 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -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