applied proper changes for Windows2019

This commit is contained in:
Dariy.Nurgaleev
2020-03-24 17:57:29 +07:00
parent 20f0972617
commit d9c166b793

View File

@@ -30,7 +30,8 @@
"image_os": "win19", "image_os": "win19",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"go_versions": "1.9, 1.10, 1.11, 1.12, 1.13, 1.14", "go_versions": "1.9, 1.10, 1.11, 1.12, 1.13, 1.14",
"go_default": "1.14" "go_default": "1.14",
"boost_default": "1.72.0"
}, },
"sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"], "sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
"builders": [ "builders": [
@@ -102,6 +103,12 @@
"{{ template_dir }}/scripts/Installers/Windows2019/Initialize-VM.ps1" "{{ template_dir }}/scripts/Installers/Windows2019/Initialize-VM.ps1"
] ]
}, },
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
]
},
{ {
"type": "windows-restart", "type": "windows-restart",
"restart_timeout": "10m" "restart_timeout": "10m"
@@ -188,7 +195,7 @@
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1" "{{ template_dir }}/scripts/Installers/Windows2019/Install-SSDTExtensions.ps1"
] ]
}, },
{ {
@@ -204,7 +211,7 @@
{ {
"type": "powershell", "type": "powershell",
"scripts": [ "scripts": [
"{{ template_dir }}/scripts/Installers/Windows2019/Install-WDK.ps1" "{{ template_dir }}/scripts/Installers/Install-WDK.ps1"
] ]
}, },
{ {
@@ -220,13 +227,13 @@
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Windows2019/Validate-Wix.ps1" "{{ template_dir }}/scripts/Installers/Validate-Wix.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1" "{{ template_dir }}/scripts/Installers/Windows2019/Validate-SSDTExtensions.ps1"
] ]
}, },
{ {
@@ -238,7 +245,7 @@
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Windows2019/Validate-WDK.ps1" "{{ template_dir }}/scripts/Installers/Validate-WDK.ps1"
] ]
}, },
{ {
@@ -247,12 +254,6 @@
"{{ template_dir }}/scripts/Installers/Validate-ServiceFabricSDK.ps1" "{{ template_dir }}/scripts/Installers/Validate-ServiceFabricSDK.ps1"
] ]
}, },
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
]
},
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
@@ -298,6 +299,12 @@
"{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1" "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
] ]
}, },
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
]
},
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
@@ -499,8 +506,8 @@
{ {
"type": "powershell", "type": "powershell",
"environment_vars": [ "environment_vars": [
"BOOST_VERSIONS=1.69.0,1.72.0", "ROOT_FOLDER={{user `root_folder`}}",
"BOOST_DEFAULT=1.72.0" "BOOST_DEFAULT={{user `boost_default`}}"
], ],
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Install-Boost.ps1" "{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -536,12 +543,6 @@
"{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1" "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1"
] ]
}, },
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
]
},
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
@@ -615,6 +616,12 @@
"{{ template_dir }}/scripts/Installers/Validate-ToolCache.ps1" "{{ template_dir }}/scripts/Installers/Validate-ToolCache.ps1"
] ]
}, },
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
]
},
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
@@ -640,8 +647,8 @@
{ {
"type": "powershell", "type": "powershell",
"environment_vars": [ "environment_vars": [
"BOOST_VERSIONS=1.69.0,1.72.0", "ROOT_FOLDER={{user `root_folder`}}",
"BOOST_DEFAULT=1.72.0" "BOOST_DEFAULT={{user `boost_default`}}"
], ],
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1" "{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -815,12 +822,6 @@
"{{ template_dir }}/scripts/Installers/Validate-GitVersion.ps1" "{{ template_dir }}/scripts/Installers/Validate-GitVersion.ps1"
] ]
}, },
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
]
},
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[