@@ -42,7 +42,9 @@ name: Gradle patch compatibility
4242# the same suites, filters, Gradle lines and JDKs on ubuntu on every PR and
4343# in the merge queue. The ubuntu `extras` run on a PR only when it touches
4444# Gradle code (`changes` below); every other PR gets them from the nightly
45- # (#1177). Windows cells run on every PR that matches `paths:`.
45+ # (#1177). Windows cells run on every PR that matches `paths:`, except
46+ # hosted on the middle Gradle lines (7.6.6, 8.14.3), which run nightly: a PR
47+ # runs hosted on Windows on 6.9.4 and 9.8.0 only (#1300).
4648
4749on :
4850 pull_request :
@@ -110,7 +112,7 @@ jobs:
110112 # Whether this run needs the ubuntu `extras`: always off pull_request, and
111113 # on a PR only when it touches Gradle code.
112114 if : github.event.pull_request.draft != true
113- runs-on : ubuntu-latest
115+ runs-on : ${{ vars.DISABLE_DEPOT_RUNNERS == 'true' && ' ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
114116 timeout-minutes : 5
115117 outputs :
116118 gradle_core : ${{ steps.diff.outputs.gradle_core }}
@@ -158,7 +160,7 @@ jobs:
158160 - os : ${{ github.event_name == 'pull_request' && 'macos-latest' || '' }}
159161 # On a PR only the ubuntu `extras` use the ubuntu build.
160162 - os : ${{ github.event_name == 'pull_request' && needs.changes.outputs.gradle_core != 'true' && 'ubuntu-latest' || '' }}
161- runs-on : ${{ matrix.os }}
163+ runs-on : ${{ vars.DISABLE_DEPOT_RUNNERS != 'true' && (matrix.os == 'ubuntu-latest' && 'depot-ubuntu-24.04-4' || matrix.os == 'ubuntu-22.04' && 'depot-ubuntu-22.04-4') || matrix.os }}
162164 timeout-minutes : 60
163165 env :
164166 CARGO_PROFILE_DEV_DEBUG : ' 0'
@@ -235,7 +237,17 @@ jobs:
235237 - os : ${{ github.event_name == 'pull_request' && 'macos-latest' || '' }}
236238 # ci.yml's `e2e` runs these ubuntu cells on every PR (#1177).
237239 - os : ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || '' }}
238- runs-on : ${{ matrix.os }}
240+ # Windows hosted on a PR: only the oldest (6.9.4) and newest (9.8.0)
241+ # lines. The middle two are ~40 min each, 40% of a PR run's Windows
242+ # minutes; they run nightly, and ci.yml's `e2e` runs hosted on all
243+ # four lines on ubuntu on every PR (#1300).
244+ - os : ${{ github.event_name == 'pull_request' && 'windows-latest' || '' }}
245+ gradle : ' 7.6.6'
246+ mode : hosted
247+ - os : ${{ github.event_name == 'pull_request' && 'windows-latest' || '' }}
248+ gradle : ' 8.14.3'
249+ mode : hosted
250+ runs-on : ${{ vars.DISABLE_DEPOT_RUNNERS != 'true' && (matrix.os == 'ubuntu-latest' && 'depot-ubuntu-24.04-4' || matrix.os == 'ubuntu-22.04' && 'depot-ubuntu-22.04-4') || matrix.os }}
239251 timeout-minutes : 60
240252 steps : &cell-steps
241253 - name : Checkout
@@ -423,7 +435,7 @@ jobs:
423435 # Only the suite that owns those tests: e2e_vendor_jvm_build has none,
424436 # and every landed suite a cell runs must run a test.
425437 - {os: ubuntu-latest, gradle: '8.14.3', java: '21', mode: vendor, label: real-central, real_central: '1', suites: 'e2e_vendor_gradle_build', test_filter: 'gradle_vendor_511 gradle_vendor_487'}
426- runs-on : ${{ matrix.os }}
438+ runs-on : ${{ vars.DISABLE_DEPOT_RUNNERS != 'true' && (matrix.os == 'ubuntu-latest' && 'depot-ubuntu-24.04-4' || matrix.os == 'ubuntu-22.04' && 'depot-ubuntu-22.04-4') || matrix.os }}
427439 timeout-minutes : 60
428440 continue-on-error : ${{ matrix.record_only == 'true' }}
429441 steps : *cell-steps
0 commit comments