Skip to content

Commit 2c177da

Browse files
authored
Merge pull request #2119 from tegonal-bot/gt/update/tegonal-gh-commons
update files of remote tegonal-gh-commons to version v5.0.2 via gt
2 parents 462b9e8 + 1ca0079 commit 2c177da

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

.github/workflows/matrix.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
const {MatrixBuilder} = require('./matrix_builder');
2-
const {configureKotlinDefaults, setMatrix} = require('./matrix_commons');
2+
const {configureKotlinDefaults, javaDistributionAxis, javaVersionAxis, setMatrix} = require('./matrix_commons');
33

44
const matrix = new MatrixBuilder();
5-
configureKotlinDefaults(matrix)
5+
// we are not ready yet for jdk25 as it requires gradle 9.x which no longer supports jdk11 but we still want
6+
// to support jdk11 for now
7+
const withoutJdk25 = {...javaVersionAxis, values: javaVersionAxis.values.filter(x => x != '25') };
8+
configureKotlinDefaults(matrix, javaDistributionAxis, withoutJdk25);
69

710
setMatrix(matrix, 4);

.github/workflows/matrix_commons.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
66
// /___/ Please report bugs and contribute back your improvements
77
//
8-
// Version: v4.2.0
8+
// Version: v5.0.2
99
//##################################
1010
// adapted version of https://github.com/vlsi/github-actions-random-matrix/blob/main/examples/matrix.js
1111
// licensed under Apache License 2.0
@@ -32,7 +32,7 @@ const javaDistributionAxis = {
3232
]
3333
};
3434

35-
const javaVersionAxis = javaVersionAxisBuilder(['11', '17', '21']);
35+
const javaVersionAxis = javaVersionAxisBuilder(['11', '17', '21', '25']);
3636

3737
function javaVersionAxisBuilder(values){
3838
return {
@@ -83,19 +83,12 @@ function configureJavaDefaults(matrix, distributionAxis = javaDistributionAxis,
8383
generateUbuntuWindowsRows(matrix);
8484
}
8585

86-
function configureKotlinDefaults(matrix) {
87-
const kotlinJavaDistributionAxis = {
88-
...javaDistributionAxis,
89-
values: javaDistributionAxis.values.filter ( x =>
90-
// seems to have problems with kotlin https://youtrack.jetbrains.com/issue/KT-61836
91-
x != 'semeru'
92-
)
93-
};
94-
configureJavaDefaults(matrix, kotlinJavaDistributionAxis);
86+
function configureKotlinDefaults(matrix, distributionAxis = javaDistributionAxis, versionAxis = javaVersionAxis, operatingSystemAxis = osAxis) {
87+
configureJavaDefaults(matrix, distributionAxis, versionAxis, operatingSystemAxis);
9588
}
9689

97-
function configureScalaDefaults(matrix) {
98-
configureJavaDefaults(matrix);
90+
function configureScalaDefaults(matrix, distributionAxis = javaDistributionAxis, versionAxis = javaVersionAxis, operatingSystemAxis = osAxis) {
91+
configureJavaDefaults(matrix, distributionAxis, versionAxis, operatingSystemAxis);
9992
}
10093

10194
// see https://github.com/actions/toolkit/issues/1218
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#@ Version: 1.2.0
22
tag file relativeTarget tagFilter hasPlaceholder sha512
3-
v4.2.0 src/.github/workflows/matrix_commons.js ../.github/workflows/matrix_commons.js .* false d200a775c748e606a25615e59f721c171cec98b00a112ada8bda7b3a0cca34685fd92320c7f083eca1309932932f04b8a0f1e68e1608344b674df37e3261ecc1
3+
v5.0.2 src/.github/workflows/matrix_commons.js ../.github/workflows/matrix_commons.js .* false f5ae025db5ff8e359f758fb825b4743480568301b3d7dc45a0c3c2ab5442d3b5d3de2756534a61f3741d1a6e17fe85183128b571b98acf1145f5465d48c0192d

0 commit comments

Comments
 (0)