update files of remote tegonal-gh-commons to version v2.5.0 via gt

tegonal · Apr 8, 2024 · 04bd20c · 04bd20c
1 parent bf0514f
commit 04bd20c
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 42 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,7 +5,7 @@
 #  \__/\__/\_, /\___/_//_/\_,_/_/         It is licensed under Creative Commons Zero v1.0 Universal
 #         /___/                           Please report bugs and contribute back your improvements
 #
-#                                         Version: v2.3.1
+#                                         Version: v2.5.0
 ###################################
 
 # https://editorconfig.org

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -6,7 +6,7 @@
 #  \__/\__/\_, /\___/_//_/\_,_/_/         It is licensed under Creative Commons Zero v1.0 Universal
 #         /___/                           Please report bugs and contribute back your improvements
 #
-#                                         Version: v2.3.1
+#                                         Version: v2.5.0
 ###################################
 -->
 # Contributor Covenant Code of Conduct

diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
@@ -5,7 +5,7 @@
 #  \__/\__/\_, /\___/_//_/\_,_/_/         It is licensed under Creative Commons Zero v1.0 Universal
 #         /___/                           Please report bugs and contribute back your improvements
 #
-#                                         Version: v2.3.1
+#                                         Version: v2.5.0
 ###################################
 name: Cleanup
 

diff --git a/.github/workflows/matrix_commons.js b/.github/workflows/matrix_commons.js
@@ -5,7 +5,7 @@
 //  \__/\__/\_, /\___/_//_/\_,_/_/         It is licensed under Apache License 2.0
 //         /___/                           Please report bugs and contribute back your improvements
 //
-//                                         Version: v2.4.0
+//                                         Version: v2.5.0
 //##################################
 // adapted version of https://github.com/vlsi/github-actions-random-matrix/blob/main/examples/matrix.js
 // licensed under Apache License 2.0
@@ -45,6 +45,44 @@ const osAxis = {
 	]
 }
 
+function generateJavaMinMaxRows(matrix) {
+	// generate one with oldest java and one with newest java version
+	matrix.generateRow({java_version: matrix.axisByName.java_version.values[0]});
+	matrix.generateRow({java_version: matrix.axisByName.java_version.values.slice(-1)[0]});
+}
+
+function generateUbuntuWindowsRows(matrix) {
+	matrix.generateRow({os: 'ubuntu-latest'});
+	matrix.generateRow({os: 'windows-latest'});
+}
+
+function configureJavaDefaults(matrix, distributionAxis = javaDistributionAxis, versionAxis = javaVersionAxis, operatingSystemAxis = osAxis ) {
+	matrix.addAxis(distributionAxis);
+	matrix.addAxis(versionAxis);
+	matrix.addAxis(operatingSystemAxis);
+
+	// This specifies the order of axes in CI job name (individual titles would be joined with a comma)
+	matrix.setNamePattern(['java_version', 'java_distribution', 'os']);
+
+	generateJavaMinMaxRows(matrix);
+	generateUbuntuWindowsRows(matrix);
+}
+
+function configureKotlinDefaults(matrix) {
+	const kotlinJavaDistributionAxis = {
+		...javaDistributionAxis,
+		values: javaDistributionAxis.values.filter ( x =>
+			// seems to have problems with kotlin https://youtrack.jetbrains.com/issue/KT-61836
+			x != 'semeru'
+		)
+	};
+	configureJavaDefaults(matrix, kotlinJavaDistributionAxis);
+}
+
+function configureScalaDefaults(matrix) {
+	configureJavaDefaults(matrix);
+}
+
 // see https://github.com/actions/toolkit/issues/1218
 function setOutput(key, value) {
 	// Temporary hack until core actions library catches up with github new recommendations
@@ -70,27 +108,14 @@ function setMatrix(matrix, numberOfJobs) {
 	setOutput('matrix', JSON.stringify({include}));
 }
 
-function configureKotlinDefaults(matrix) {
-	const kotlinJavaDistributionAxis = {
-		...javaDistributionAxis,
-		values: javaDistributionAxis.values.filter ( x =>
-			// seems to have problems with kotlin https://youtrack.jetbrains.com/issue/KT-61836
-			x != 'semeru'
-		)
-	};
-
-	matrix.addAxis(kotlinJavaDistributionAxis);
-	matrix.addAxis(javaVersionAxis);
-	matrix.addAxis(osAxis);
-
-	// This specifies the order of axes in CI job name (individual titles would be joined with a comma)
-	matrix.setNamePattern(['java_version', 'java_distribution', 'os']);
-
-	// generate one with oldest java and one with newest java version
-	matrix.generateRow({java_version: matrix.axisByName.java_version.values[0]});
-	matrix.generateRow({java_version: matrix.axisByName.java_version.values.slice(-1)[0]});
-	matrix.generateRow({os: 'ubuntu-latest'});
-	matrix.generateRow({os: 'windows-latest'});
-}
-
-module.exports = { javaDistributionAxis, javaVersionAxis, osAxis, setMatrix, configureKotlinDefaults };
+module.exports = {
+	javaDistributionAxis,
+	javaVersionAxis,
+	osAxis,
+	setMatrix,
+	generateJavaMinMaxRows,
+	generateUbuntuWindowsRows,
+	configureJavaDefaults,
+	configureKotlinDefaults,
+	configureScalaDefaults,
+};
diff --git a/.gt/remotes/tegonal-gh-commons/lib/src/gt/pull-hook-functions.sh b/.gt/remotes/tegonal-gh-commons/lib/src/gt/pull-hook-functions.sh
@@ -6,7 +6,7 @@
 #  \__/\__/\_, /\___/_//_/\_,_/_/         It is licensed under Creative Commons Zero v1.0 Universal
 #         /___/                           Please report bugs and contribute back your improvements
 #
-#                                         Version: v2.3.1
+#                                         Version: v2.5.0
 #######  Description  #############
 #
 #  functions which can be used to update the placeholders in the templates in a gt pull-hook.sh
@@ -18,12 +18,11 @@
 #    shopt -s inherit_errexit
 #    MY_PROJECT_LATEST_VERSION="v1.0.0"
 #
-#    # Assumes tegonal's github-commons was fetched with gt and put into repoRoot/.gt/remotes/tegonal-gh-commons/lib
-#    # - adjust remote name or location accordingly
-#    dir_of_github_commons="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/lib/src"
+#    # Assumes tegonal's github-commons was fetched with gt and put into repoRoot/lib/tegonal-gh-commons/src
+#    dir_of_github_commons="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../../../lib/tegonal-gh-commons/src"
 #
 #    if ! [[ -v dir_of_tegonal_scripts ]]; then
-#    	dir_of_tegonal_scripts="$dir_of_github_commons/../tegonal-scripts/src"
+#    	dir_of_tegonal_scripts="$dir_of_github_commons/../../tegonal-scripts/src"
 #    	source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts"
 #    fi
 #

diff --git a/.gt/remotes/tegonal-gh-commons/pulled.tsv b/.gt/remotes/tegonal-gh-commons/pulled.tsv
@@ -1,10 +1,10 @@
 #@ Version: 1.0.0
 tag	file	relativeTarget	sha512
-v2.3.1	src/.github/CODE_OF_CONDUCT.md	../.github/CODE_OF_CONDUCT.md	5838a37dd9cea5b97bcab8b3cbcd1b97034f38158697a34a1548a02a98878a275ad6a1d05591cc9cec799c1e38f437d1d682823754ec159369a215ab52719487
-v2.3.1	src/.github/PULL_REQUEST_TEMPLATE.md	../.github/PULL_REQUEST_TEMPLATE.md	9112d1ea1f72ea250cdfe686fc152e63f2e0cdcea9c46935289471d7a3f54c35af8a3f283570f5d863e936c7782939c7b1548cb7d4ccda712bbf9314926f58cb
-v2.3.1	src/gt/pull-hook-functions.sh	remotes/tegonal-gh-commons/lib/src/gt/pull-hook-functions.sh	a9009a41dd99682f842a7df94dfe1a5e017574b69d12cf6345be8116cc1c762a0662024e7d320760e536d2e7cc224cf71826dee0327a6cdec19e04e81153d12e
-v2.3.1	src/.github/Contributor Agreement.txt	../.github/Contributor Agreement.txt	0b9a8a954edf302ca5fe0062b7e283d3da06a6bc0631a812663095a78b3a734cefb43b725ae342694d770be75206124c42a1150e168fac33f28aebea0bda35ec
-v2.3.1	src/dotfiles/.editorconfig	../.editorconfig	2a1523c111d981fdb62e6d8d65b5437c2c704483c3c437ec9336d966d9aaaec3b69efefaacc14e6b71236b9cc9e69ecd3a54e7ff7eaa8efd0a9a8c543a3ee258
-v2.3.1	src/.github/workflows/cleanup.yml	../.github/workflows/cleanup.yml	989532451129fb6a971031387c6141f98718941948999477fc9b3d353276de4d4325b92d5758384816c49db5b0ad45dbaf8beaf266c5d4ea05d038f186f301f8
-v2.3.1	src/dotfiles/.shellcheckrc	../.shellcheckrc	a65a49499e128815d629001d4577b9989a148ba904336450a42897349395303e356d894b2867a4ddaba59e4b77d7438546bc108728ef1e7d30813e8494b02325
-v2.4.0	src/.github/workflows/matrix_commons.js	../.github/workflows/matrix_commons.js	631e1208be178f899ef890abcecd75b91ddbcf2b6f3f11674f075df240e2237aa4ff92c87dc57cef571eb27cd046126461a8bf8e0dd7fbccd3b5607e5b92a2b7
+v2.5.0	src/.github/CODE_OF_CONDUCT.md	../.github/CODE_OF_CONDUCT.md	855250b31a099b8d6eb77f52a6363c01e083fd952a78a4fe7aacf00c5dfce98a2f4c4c0bde869e1a73c97eea49be480954a3c58766e1544171a8314ea6b69e76
+v2.5.0	src/.github/PULL_REQUEST_TEMPLATE.md	../.github/PULL_REQUEST_TEMPLATE.md	9112d1ea1f72ea250cdfe686fc152e63f2e0cdcea9c46935289471d7a3f54c35af8a3f283570f5d863e936c7782939c7b1548cb7d4ccda712bbf9314926f58cb
+v2.5.0	src/gt/pull-hook-functions.sh	remotes/tegonal-gh-commons/lib/src/gt/pull-hook-functions.sh	8ffef79eb036cd820e8a0cf730c3520caa54d6ae034f0962912fe2b1cfd647f087c888ba8429a7e75b026eca2b6b577ece7fdcd3ae9e66b68d5ef48d35b6b15e
+v2.5.0	src/.github/Contributor Agreement.txt	../.github/Contributor Agreement.txt	0b9a8a954edf302ca5fe0062b7e283d3da06a6bc0631a812663095a78b3a734cefb43b725ae342694d770be75206124c42a1150e168fac33f28aebea0bda35ec
+v2.5.0	src/dotfiles/.editorconfig	../.editorconfig	06461dfe5bfa92df94db59a65994bfb57593ca81082b73186de22d4469f05a9913e62ce4ef4f84c0c335c90335ee9d9f21e282f1da66b7345077420e644632d3
+v2.5.0	src/.github/workflows/cleanup.yml	../.github/workflows/cleanup.yml	64325a8fa960293271c4ac654ea42c6f3a54dacb43a588a294fdb4bde39f9b63cd045dc02c913e6c60e6ff358293a7bd2e96f90db7c56d768f2b43c5b30fbcde
+v2.5.0	src/dotfiles/.shellcheckrc	../.shellcheckrc	c5889dc0f110c27092a795ecac1398549db82ca438891033c632bcad3cd0001814eb5fcd4d2de4d0e57d7a3be450f4dc100737941fdb41ace2873faee285a3ca
+v2.5.0	src/.github/workflows/matrix_commons.js	../.github/workflows/matrix_commons.js	31edbe8d3010b61cef0db1161d012905166c3fcee9625da8c9f52297b628959018c9c462a91212b2f630f829bf4d1f186f946ede32ee010c10509576dd4e42b3
diff --git a/.shellcheckrc b/.shellcheckrc
@@ -5,7 +5,7 @@
 #  \__/\__/\_, /\___/_//_/\_,_/_/         It is licensed under Creative Commons Zero v1.0 Universal
 #         /___/                           Please report bugs and contribute back your improvements
 #
-#                                         Version: v2.3.1
+#                                         Version: v2.5.0
 ###################################
 
 # Prefer putting braces around variable references even when not strictly required.