actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-06 18:19:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed merge conflicts

Browse Source
This commit is contained in:
Dariy.Nurgaleev
2020-03-20 00:22:12 +07:00
parent 8875bb3585 0ddeb1ac4b
commit 98d3de4ca4
48 changed files with 513 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
images/win/Windows2016-Azure.json
View File

@@ -30,7 +30,8 @@
"image_os": "win16",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"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.69.0"
},
"sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
"builders": [
@@ -102,6 +103,12 @@
"{{ template_dir }}/scripts/Installers/Windows2016/Initialize-VM.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
]
},
{
"type": "windows-restart",
"restart_timeout": "30m"
@@ -207,7 +214,7 @@
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Install-Wix.ps1"
"{{ template_dir }}/scripts/Installers/Install-Wix.ps1"
]
},
{
@@ -223,7 +230,7 @@
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Install-WDK.ps1"
"{{ template_dir }}/scripts/Installers/Install-WDK.ps1"
]
},
{
@@ -245,7 +252,7 @@
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Validate-Wix.ps1"
"{{ template_dir }}/scripts/Installers/Validate-Wix.ps1"
]
},
{
@@ -257,7 +264,7 @@
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Validate-WDK.ps1"
"{{ template_dir }}/scripts/Installers/Validate-WDK.ps1"
]
},
{
@@ -266,12 +273,6 @@
"{{ template_dir }}/scripts/Installers/Validate-ServiceFabricSDK.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
]
},
{
"type": "powershell",
"scripts":[
@@ -323,6 +324,12 @@
"{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
]
},
{
"type": "powershell",
"scripts":[
@@ -518,8 +525,8 @@
{
"type": "powershell",
"environment_vars": [
"BOOST_VERSIONS=1.69.0,1.72.0",
"BOOST_DEFAULT=1.69.0"
"ROOT_FOLDER={{user `root_folder`}}",
"BOOST_DEFAULT={{user `boost_default`}}"
],
"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":[
@@ -628,6 +629,12 @@
"{{ template_dir }}/scripts/Installers/Validate-ToolCache.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
]
},
{
"type": "powershell",
"scripts":[
@@ -653,8 +660,8 @@
{
"type": "powershell",
"environment_vars": [
"BOOST_VERSIONS=1.69.0,1.72.0",
"BOOST_DEFAULT=1.69.0"
"ROOT_FOLDER={{user `root_folder`}}",
"BOOST_DEFAULT={{user `boost_default`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -834,12 +841,6 @@
"{{ template_dir }}/scripts/Installers/Validate-GitVersion.ps1"
]
},
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
]
},
{
"type": "powershell",
"scripts":[