Skip to content

Commit a82fa09

Browse files
vlsiclaude
andcommitted
ci: pass the test JDK vendor to the Gradle toolchain
The per-row post-processing in matrix.mjs read `java_vendor` from `v.java_distribution` after that field had already been overwritten with its string `value`, so `v.java_distribution.vendor` was always `undefined`. As a result `jdkTestVendor` reached Gradle empty and the test toolchain was never pinned to the matrix vendor, so tests could run on any installed JDK of the matching version. Destructure the axis object before overwriting the field, so the read no longer depends on statement order. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 5748b50 commit a82fa09

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/matrix.mjs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,9 @@ include.forEach(v => {
140140
// Gradle does not work in tr_TR locale, so pass locale to test only: https://github.com/gradle/gradle/issues/17361
141141
jvmArgs.push(`-Duser.country=${v.locale.country}`);
142142
jvmArgs.push(`-Duser.language=${v.locale.language}`);
143-
v.java_distribution = v.java_distribution.value;
144-
v.java_vendor = v.java_distribution.vendor;
143+
const {value: javaDistribution, vendor: javaVendor} = v.java_distribution;
144+
v.java_distribution = javaDistribution;
145+
v.java_vendor = javaVendor;
145146
if (v.java_distribution === 'oracle') {
146147
v.oracle_java_website = v.java_version === eaJava ? 'jdk.java.net' : 'oracle.com';
147148
}

0 commit comments

Comments
 (0)