actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-11 03:27:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu] add maven back to toolset (#4507)

Browse Source
This commit is contained in:
Mikhail Koliada
2021-11-15 14:51:38 +03:00
committed by GitHub
parent fad30aa851
commit d09b1f8f9c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
images/linux/scripts/installers/java-tools.sh
View File

@@ -34,7 +34,7 @@ for JAVA_VERSION in ${JAVA_VERSIONS_LIST[@]}; do
if [[ -z $fullJavaVersion ]]; then if [[ -z $fullJavaVersion ]]; then
fullJavaVersion=$(java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}') fullJavaVersion=$(java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}')
fi fi
javaToolcacheVersionPath="$JAVA_TOOLCACHE_PATH/$fullJavaVersion" javaToolcacheVersionPath="$JAVA_TOOLCACHE_PATH/$fullJavaVersion"
mkdir -p "$javaToolcacheVersionPath" mkdir -p "$javaToolcacheVersionPath"
@@ -57,12 +57,11 @@ apt-fast install -y --no-install-recommends ant ant-optional
echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment
# Install Maven # Install Maven
json=$(curl -s "https://api.github.com/repos/apache/maven/tags") mavenVersion=$(get_toolset_value '.java.maven')
latestMavenVersion=$(echo $json | jq -r '.[] | select(.name | match("^(maven-[0-9.]*)$")) | .name' | head -1 | cut -d- -f2) mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip"
mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${latestMavenVersion}/binaries/apache-maven-${latestMavenVersion}-bin.zip" download_with_retries ${mavenDownloadUrl} "/tmp" "maven.zip"
download_with_retries $mavenDownloadUrl "/tmp" "maven.zip"
unzip -qq -d /usr/share /tmp/maven.zip unzip -qq -d /usr/share /tmp/maven.zip
ln -s /usr/share/apache-maven-${latestMavenVersion}/bin/mvn /usr/bin/mvn ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn
# Install Gradle # Install Gradle
# This script founds the latest gradle release from https://services.gradle.org/versions/all # This script founds the latest gradle release from https://services.gradle.org/versions/all

3
images/linux/toolsets/toolset-1804.json
View File

@@ -73,7 +73,8 @@
"default": "8", "default": "8",
"versions": [ "versions": [
"8", "11", "12" "8", "11", "12"
] ],
"maven": "3.8.3"
}, },
"android": { "android": {
"platform_min_version": "23", "platform_min_version": "23",

3
images/linux/toolsets/toolset-2004.json
View File

@@ -74,7 +74,8 @@
"default": "11", "default": "11",
"versions": [ "versions": [
"8", "11" "8", "11"
] ],
"maven": "3.8.3"
}, },
"android": { "android": {
"platform_min_version": "27", "platform_min_version": "27",