(jmeter) branch master updated: chore: add Java 22 (ignored) version to the build matrix

[vladimirsitnikov]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 71bb952320 chore: add Java 22 (ignored) version to the build matrix
71bb952320 is described below

commit 71bb952320f2bee3034686206c1bbaf80d78ea8b
Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com>
AuthorDate: Fri Nov 24 14:27:41 2023 +0300

    chore: add Java 22 (ignored) version to the build matrix
---
 .github/workflows/matrix.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index 1301e48b16..c03fdade12 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -18,7 +18,7 @@ matrix.addAxis({
   ]
 });
 
-const eaJava = '21';
+const eaJava = '22';
 
 matrix.addAxis({
   name: 'java_version',
@@ -27,6 +27,7 @@ matrix.addAxis({
     '8',
     '11',
     '17',
+    '21',
     eaJava,
   ]
 });
@@ -83,7 +84,9 @@ matrix.exclude({java_distribution: {value: 'semeru'}, 
java_version: '8'});
 matrix.exclude({java_distribution: {value: 'microsoft'}, java_version: '8'});
 // Oracle JDK is only supported for JDK 17 and later
 matrix.exclude({java_distribution: {value: 'oracle'}, java_version: ['8', 
'11']});
-// matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
+// Ignore builds with JAVA EA for now, see 
https://github.com/apache/jmeter/issues/6114
+matrix.exclude({java_version: eaJava})
+matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
 // TODO: Semeru does not ship Java 21 builds yet
 matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'})
 // Ensure at least one job with "same" hashcode exists
@@ -98,8 +101,10 @@ matrix.generateRow({java_version: "8"});
 matrix.generateRow({java_version: "11"});
 // Ensure there will be at least one job with Java 17
 matrix.generateRow({java_version: "17"});
+// Ensure there will be at least one job with Java 21
+matrix.generateRow({java_version: "21"});
 // Ensure there will be at least one job with Java EA
-matrix.generateRow({java_version: eaJava});
+// matrix.generateRow({java_version: eaJava});
 const include = matrix.generateRows(process.env.MATRIX_JOBS || 5);
 if (include.length === 0) {
   throw new Error('Matrix list is empty');