Skip to content

Commit f1b0079

Browse files
mikolalysenkoclaude
andcommitted
Gradle grid: JDK 15 ceiling from Zulu (Temurin never shipped 15)
setup-java has no Temurin 15, so the 6.9.4 ceiling rows take Zulu 15; the CI-tier tests now pin the 6.9 <= 15 ceiling. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 parent ed5f3c7 commit f1b0079

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

‎.github/workflows/gradle-compatibility.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ jobs:
229229
if: steps.jdk.outputs.runner-jdk != 'true'
230230
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
231231
with:
232-
distribution: temurin
232+
# Temurin never shipped JDK 15 (the 6.9 ceiling); Zulu did.
233+
distribution: ${{ matrix.java == '15' && 'zulu' || 'temurin' }}
233234
java-version: ${{ matrix.java }}
234235

235236
- name: Install Maven 3.9.16 (vendor cells)

‎scripts/tests/test_ci_e2e_tiers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def test_compat_grid_expands_to_36_cells_plus_extras(self):
227227
labels.setdefault(row["label"], []).append(row)
228228
self.assertEqual(row["os"], "ubuntu-latest")
229229
ceilings = {(r["gradle"], r["java"]) for r in labels["jdk-ceiling"]}
230-
self.assertEqual(ceilings, {("6.9.4", "16"), ("7.6.6", "19"), ("8.14.3", "24")})
230+
self.assertEqual(ceilings, {("6.9.4", "15"), ("7.6.6", "19"), ("8.14.3", "24")})
231231
self.assertEqual(len(labels["jdk-ceiling"]), 9)
232232
self.assertEqual({(r["gradle"], r["mode"]) for r in labels["configuration-cache"]},
233233
{("9.8.0", "hosted"), ("9.8.0", "vendor")})
@@ -251,7 +251,7 @@ def test_compat_workflow_builds_its_own_binaries(self):
251251
"crates/socket-patch-core/src/vendor/jvm/**", "crates/socket-patch-core/src/patch/jvm_jar.rs",
252252
"crates/socket-patch-cli/tests/jvm_fixture_repo/**", "crates/socket-patch-cli/tests/e2e_*gradle*"):
253253
self.assertIn(f"'{path}'", text)
254-
self.assertIn("6.9 <= 16", text)
254+
self.assertIn("6.9 <= 15", text)
255255
self.assertIn("7.6 <= 19", text)
256256
self.assertIn("8.14 <= 24", text)
257257
self.assertIn("gradle-probe", text)

0 commit comments

Comments
 (0)