Skip to content

Commit d306010

Browse files
committed
whindows
1 parent c4d98cf commit d306010

1 file changed

Lines changed: 4 additions & 9 deletions

File tree

tests/install-maven-gradle.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ MIN_MAVEN="3.9.12"
88
MIN_GRADLE="9.2.0"
99

1010
version_gte() { printf '%s\n%s' "$2" "$1" | sort -V -C; }
11-
get_maven_ver() { mvn --version 2>/dev/null | head -1 | grep -oP '[\d.]+' | head -1 || true; }
12-
get_gradle_ver() { gradle --version 2>/dev/null | grep -oP 'Gradle \K[\d.]+' || true; }
11+
get_maven_ver() { mvn --version 2>/dev/null | head -1 | sed -n 's/.*Maven \([0-9.]*\).*/\1/p' || true; }
12+
get_gradle_ver() { gradle --version 2>/dev/null | sed -n 's/.*Gradle \([0-9.]*\).*/\1/p' || true; }
1313

1414
MVN_VER=$(get_maven_ver)
1515
GRADLE_VER=$(get_gradle_ver)
@@ -24,23 +24,18 @@ if ! $NEED_MAVEN && ! $NEED_GRADLE; then
2424
exit 0
2525
fi
2626

27-
# Resolve latest stable versions from official sources
2827
resolve_maven_version() {
29-
# Maven metadata XML lists all 3.9.x versions
3028
curl -sfL "https://repo1.maven.org/maven2/org/apache/maven/apache-maven/maven-metadata.xml" \
31-
| grep -oP '<version>3\.9\.\K[0-9]+' | sort -n | tail -1 | xargs -I{} echo "3.9.{}"
29+
| sed -n 's/.*<version>3\.9\.\([0-9]*\)<.*/\1/p' | sort -n | tail -1 | xargs -I{} echo "3.9.{}"
3230
}
3331

3432
resolve_gradle_version() {
35-
# Gradle API returns the latest release version
36-
curl -sfL "https://services.gradle.org/versions/current" | grep -oP '"version"\s*:\s*"\K[^"]+'
33+
curl -sfL "https://services.gradle.org/versions/current" | sed -n 's/.*"version"\s*:\s*"\([^"]*\)".*/\1/p'
3734
}
3835

3936
if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
40-
# Chocolatey always installs latest by default
4137
$NEED_MAVEN && choco install maven -y
4238
$NEED_GRADLE && choco install gradle -y
43-
# Refresh PATH from registry for current session
4439
CHOCO_BASE="C:/ProgramData/chocolatey/lib"
4540
MVN_BIN=$(find "$CHOCO_BASE/maven" -name "mvn.cmd" -print -quit 2>/dev/null | xargs dirname || true)
4641
GRADLE_BIN=$(find "$CHOCO_BASE/gradle" -name "gradle.bat" -print -quit 2>/dev/null | xargs dirname || true)

0 commit comments

Comments
 (0)