Merge pull request #1956 from al-cheb/al-cheb/az-hardcoded-version

[Ubuntu] Use toolset config to install az modules on Ubuntu 20
This commit is contained in:
Maxim Lobanov
2020-11-02 20:07:46 +03:00
committed by GitHub
2 changed files with 10 additions and 6 deletions

View File

@@ -8,12 +8,8 @@
source $HELPER_SCRIPTS/os.sh
# List of versions
if isUbuntu20 ; then
versions=$(pwsh -Command '(Find-Module -Name Az).Version')
else
toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset)
fi
toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset)
# Try to install and update PowerShellGet before the actual installation
pwsh -Command "Install-Module -Name PowerShellGet -Force"

View File

@@ -69,6 +69,14 @@
{"name": "MarkdownPS"},
{"name": "Pester"}
],
"azureModules": [
{
"name": "az",
"versions": [
"4.8.0"
]
}
],
"apt": {
"common_packages": [
"dbus",