Merge branch 'master' into v-vlsafo/msys2-install

This commit is contained in:
Vladimir Safonkin
2020-03-24 20:14:08 +03:00
53 changed files with 617 additions and 668 deletions

View File

@@ -15,6 +15,7 @@
"virtual_network_subnet_name": "{{env `VNET_SUBNET`}}",
"private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
"vm_size": "Standard_DS4_v2",
"run_scan_antivirus": "false",
"root_folder": "C:",
"image_folder": "C:\\image",
@@ -100,7 +101,8 @@
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Initialize-VM.ps1"
]
],
"execution_policy": "unrestricted"
},
{
"type": "powershell",
@@ -213,7 +215,7 @@
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Install-Wix.ps1"
"{{ template_dir }}/scripts/Installers/Install-Wix.ps1"
]
},
{
@@ -229,7 +231,7 @@
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Install-WDK.ps1"
"{{ template_dir }}/scripts/Installers/Install-WDK.ps1"
]
},
{
@@ -251,7 +253,7 @@
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Validate-Wix.ps1"
"{{ template_dir }}/scripts/Installers/Validate-Wix.ps1"
]
},
{
@@ -263,7 +265,7 @@
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Validate-WDK.ps1"
"{{ template_dir }}/scripts/Installers/Validate-WDK.ps1"
]
},
{
@@ -323,6 +325,12 @@
"{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
]
},
{
"type": "powershell",
"scripts":[
@@ -518,8 +526,7 @@
{
"type": "powershell",
"environment_vars": [
"BOOST_VERSIONS=1.69.0,1.72.0",
"BOOST_DEFAULT=1.69.0"
"ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -555,12 +562,6 @@
"{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
]
},
{
"type": "powershell",
"scripts":[
@@ -634,6 +635,12 @@
"{{ template_dir }}/scripts/Installers/Validate-ToolCache.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
]
},
{
"type": "powershell",
"scripts":[
@@ -659,8 +666,7 @@
{
"type": "powershell",
"environment_vars": [
"BOOST_VERSIONS=1.69.0,1.72.0",
"BOOST_DEFAULT=1.69.0"
"ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -834,12 +840,6 @@
"{{ template_dir }}/scripts/Installers/Validate-GitVersion.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
]
},
{
"type": "powershell",
"scripts":[
@@ -888,8 +888,17 @@
},
{
"type": "powershell",
"environment_vars":[
"RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Run-Antivirus.ps1"
"{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1"
]
},
{