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

simplify conditions

Browse Source
This commit is contained in:
Mikhail Timofeev
2020-05-14 17:26:38 +03:00
parent c45933094c
commit fa5384cec4
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/linux/scripts/installers/ansible.sh
View File

@@ -8,10 +8,8 @@
source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/document.sh
source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/os.sh
imageLabel=$(getOSVersionLabel)
# ppa:ansible/ansible doesn't contain packages for Ubuntu20.04 # ppa:ansible/ansible doesn't contain packages for Ubuntu20.04
if [ $imageLabel != "focal" ]; then if isUbuntu16 || isUbuntu18 ; then
add-apt-repository ppa:ansible/ansible add-apt-repository ppa:ansible/ansible
apt-get update apt-get update
fi fi

10
images/linux/scripts/installers/dotnetcore-sdk.sh
View File

@@ -8,15 +8,13 @@ source $HELPER_SCRIPTS/apt.sh
source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/document.sh
source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/os.sh
imageLabel=$(getOSVersionLabel)
# Ubuntu 20 doesn't support EOL versions # Ubuntu 20 doesn't support EOL versions
if [ $imageLabel != "focal" ]; then if isUbuntu20 ; then
LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1")
release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json")
else
LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.1") LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.1")
release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json")
else
LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1")
release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json")
fi fi
mksamples() mksamples()