Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Java 22 version (ignored) to the build matrix #6112

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Add Java 22 version (ignored) to the build matrix #6112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/matrix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ matrix.addAxis({
]
});

const eaJava = '21';
const eaJava = '22';

matrix.addAxis({
name: 'java_version',
Expand All @@ -27,6 +27,7 @@ matrix.addAxis({
'8',
'11',
'17',
'21',
eaJava,
]
});
Expand Down Expand Up @@ -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
Expand All @@ -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');
Expand Down