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

Deprecate Java 7 (#2633)

Browse Source
This commit is contained in:
Dibir Magomedsaygitov
2021-02-07 16:08:29 +03:00
committed by GitHub
parent 4491eeb15f
commit 3ca926ec34
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1
View File

@@ -18,12 +18,11 @@ function Get-JavaVersions {
return $javaVersions | Sort-Object $sortRules | ForEach-Object { return $javaVersions | Sort-Object $sortRules | ForEach-Object {
$javaPath = $_.Value $javaPath = $_.Value
$version = Get-JavaFullVersion $javaPath $version = Get-JavaFullVersion $javaPath
$vendor = $version.StartsWith("1.7") ? "Zulu" : "AdoptOpenJDK"
$defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : ""
[PSCustomObject] @{ [PSCustomObject] @{
"Version" = $version + $defaultPostfix "Version" = $version + $defaultPostfix
"Vendor" = $vendor "Vendor" = "AdoptOpenJDK"
"Environment Variable" = $_.Name "Environment Variable" = $_.Name
} }
} }

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

@@ -22,13 +22,8 @@ fi
apt-get update apt-get update
for JAVA_VERSION in ${JAVA_VERSIONS_LIST[@]}; do for JAVA_VERSION in ${JAVA_VERSIONS_LIST[@]}; do
if [[ $JAVA_VERSION == "7" ]]; then
apt-get -y install zulu-7-azure-jdk=\*
echo "JAVA_HOME_7_X64=/usr/lib/jvm/zulu-7-azure-amd64" | tee -a /etc/environment
else
apt-get -y install adoptopenjdk-$JAVA_VERSION-hotspot=\* apt-get -y install adoptopenjdk-$JAVA_VERSION-hotspot=\*
echo "JAVA_HOME_${JAVA_VERSION}_X64=/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" | tee -a /etc/environment echo "JAVA_HOME_${JAVA_VERSION}_X64=/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" | tee -a /etc/environment
fi
done done
# Set Default Java version. # Set Default Java version.

2
images/linux/scripts/tests/Java.Tests.ps1
View File

@@ -31,7 +31,7 @@ Describe "Java" {
$result = Get-CommandResult "`"$javaPath`" -version" $result = Get-CommandResult "`"$javaPath`" -version"
$result.ExitCode | Should -Be 0 $result.ExitCode | Should -Be 0
if ($Version -eq 7 -or $Version -eq 8) { if ($Version -eq 8) {
$Version = "1.${Version}" $Version = "1.${Version}"
} }
$result.Output | Should -Match ([regex]::Escape("openjdk version `"${Version}.")) $result.Output | Should -Match ([regex]::Escape("openjdk version `"${Version}."))

2
images/linux/toolsets/toolset-1604.json
View File

@@ -81,7 +81,7 @@
"java": { "java": {
"default": "8", "default": "8",
"versions": [ "versions": [
"7", "8", "11", "12" "8", "11", "12"
] ]
}, },
"android": { "android": {

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

@@ -81,7 +81,7 @@
"java": { "java": {
"default": "8", "default": "8",
"versions": [ "versions": [
"7", "8", "11", "12" "8", "11", "12"
] ]
}, },
"android": { "android": {