Skip to content

Commit ead9eaa

Browse files
Update Regex to Support All ASDF Versions for the supported distributions in tool-versions File (#767)
* Regex update to fix #719 * Check failures fix * npm run format, npm run format-check & npm run build * Regex update * regex update * fixed check failures * updated regex * regex update for all the versions * regex and docmentation update * Regex update * format and doc update * doc format update * npm audit fix * resolve conflicts * resolve conflicts * resolve conflicts * doc update * Java version upgrade
1 parent 8c57fa3 commit ead9eaa

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

dist/cleanup/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94704,7 +94704,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
9470494704
const versionFileName = getFileName(versionFile);
9470594705
if (versionFileName == '.tool-versions') {
9470694706
javaVersionRegExp =
94707-
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
94707+
/^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
9470894708
}
9470994709
else {
9471094710
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

dist/setup/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132739,7 +132739,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
132739132739
const versionFileName = getFileName(versionFile);
132740132740
if (versionFileName == '.tool-versions') {
132741132741
javaVersionRegExp =
132742-
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
132742+
/^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
132743132743
}
132744132744
else {
132745132745
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

docs/advanced-usage.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,5 +614,9 @@ major versions: 8, 11, 16, 17, 21
614614
more specific versions: 8.0.282+8, 8.0.232, 11.0, 11.0.4, 17.0
615615
early access (EA) versions: 15-ea, 15.0.0-ea
616616
versions with specified distribution: openjdk64-11.0.2
617+
LTS versions : temurin-21.0.5+11.0.LTS
617618
```
618619
If the file contains multiple versions, only the first one will be recognized.
620+
621+
***NOTE***:
622+
For the tool-version file, ensure that you use standard semantic versioning (semver) formats, as non-standard formats (such as jetbrains-21b212.1) may not be parsed correctly. Additionally, for complex version strings containing multiple version-like segments (for example, java semeru-openj9-11.0.15+10_openj9-0.32.0), the extraction logic may incorrectly capture the last segment (0.32.0) instead of the main version (11.0.15+10).

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@
6060
"url": "https://github.com/actions/setup-java/issues"
6161
},
6262
"homepage": "https://github.com/actions/setup-java#readme"
63-
}
63+
}

src/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export function getVersionFromFileContent(
133133
const versionFileName = getFileName(versionFile);
134134
if (versionFileName == '.tool-versions') {
135135
javaVersionRegExp =
136-
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
136+
/^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
137137
} else {
138138
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
139139
}

0 commit comments

Comments
 (0)