Merge branch 'v-mitim/add_ubuntu_20_to_ci' of https://github.com/miketimofeev/virtual-environments into v-mitim/add_ubuntu_20_to_ci
This commit is contained in:
@@ -6,19 +6,19 @@
|
|||||||
source $HELPER_SCRIPTS/etc-environment.sh
|
source $HELPER_SCRIPTS/etc-environment.sh
|
||||||
source $HELPER_SCRIPTS/apt.sh
|
source $HELPER_SCRIPTS/apt.sh
|
||||||
source $HELPER_SCRIPTS/document.sh
|
source $HELPER_SCRIPTS/document.sh
|
||||||
|
source $HELPER_SCRIPTS/os.sh
|
||||||
|
|
||||||
if isUbuntu20 ; then
|
imageLabel=$(getOSVersionLabel)
|
||||||
|
|
||||||
|
# Ubuntu 20 doesn't support EOL versions
|
||||||
|
if [ $imageLabel != "focal" ]; 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")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if isUbuntu16 || isUbuntu18 ; 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")
|
|
||||||
fi
|
|
||||||
|
|
||||||
LSB_RELEASE=$(lsb_release -rs)
|
|
||||||
|
|
||||||
mksamples()
|
mksamples()
|
||||||
{
|
{
|
||||||
sdk=$1
|
sdk=$1
|
||||||
|
|||||||
Reference in New Issue
Block a user