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

small rework

Browse Source
This commit is contained in:
Dibir Magomedsaygitov
2020-11-05 19:35:43 +03:00
parent 46520bfdb3
commit 7f98841545
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh
# Ubuntu 20 doesn't support EOL versions # Ubuntu 20 doesn't support EOL versions
toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
LATEST_DOTNET_PACKAGES=$(jq -r '.dotnetCoreSdk.latest_dotnet_packages[]' $toolset) LATEST_DOTNET_PACKAGES=$(jq -r '.dotnet.aptPackages[]' $toolset)
release_urls=$(jq -r '.dotnetCoreSdk.release_urls[]' $toolset) versions=$(jq -r '.dotnet.versions[]' $toolset)
mksamples() mksamples()
{ {
@@ -44,7 +44,8 @@ done
# Get list of all released SDKs from channels which are not end-of-life or preview # Get list of all released SDKs from channels which are not end-of-life or preview
sdks=() sdks=()
for release_url in ${release_urls[@]}; do for version in ${versions[@]}; do
release_url="https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version}/releases.json"
echo "${release_url}" echo "${release_url}"
releases=$(curl "${release_url}") releases=$(curl "${release_url}")
sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdk.version')) sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdk.version'))

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

@@ -189,18 +189,17 @@
"ubuntu:14.04" "ubuntu:14.04"
] ]
}, },
"dotnetCoreSdk": { "dotnet": {
"latest_dotnet_packages": [ "aptPackages": [
"dotnet-sdk-3.0", "dotnet-sdk-3.0",
"dotnet-sdk-3.1", "dotnet-sdk-3.1",
"dotnet-sdk-5.0" "dotnet-sdk-5.0"
], ],
"release_urls": [ "versions": [
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json", "2.1",
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json", "3.0",
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json", "3.1",
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/5.0/releases.json" "5.0"
] ]
} }
} }

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

@@ -193,17 +193,17 @@
"cmd": "sam" "cmd": "sam"
} }
], ],
"dotnetCoreSdk": { "dotnet": {
"latest_dotnet_packages": [ "aptPackages": [
"dotnet-sdk-3.0", "dotnet-sdk-3.0",
"dotnet-sdk-3.1", "dotnet-sdk-3.1",
"dotnet-sdk-5.0" "dotnet-sdk-5.0"
], ],
"release_urls": [ "versions": [
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json", "2.1",
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json", "3.0",
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json", "3.1",
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/5.0/releases.json" "5.0"
] ]
} }
} }

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

@@ -167,15 +167,15 @@
"cmd": "sam" "cmd": "sam"
} }
], ],
"dotnetCoreSdk": { "dotnet": {
"latest_dotnet_packages": [ "aptPackages": [
"dotnet-sdk-3.1", "dotnet-sdk-3.1",
"dotnet-sdk-5.0" "dotnet-sdk-5.0"
], ],
"release_urls": [ "versions": [
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json", "2.1",
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json", "3.1",
"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/5.0/releases.json" "5.0"
] ]
} }
} }