rework ruby installation

This commit is contained in:
Aleksandr Chebotov
2020-11-12 20:09:32 +03:00
parent ec9befb26a
commit fe3f5efbe8
11 changed files with 169 additions and 154 deletions

View File

@@ -26,13 +26,11 @@
"capture_name_prefix": "packer",
"image_version": "dev",
"image_os": "win16",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"announcements": "{{env `ANNOUNCEMENTS`}}"
},
"sensitive-variables": [
"install_password",
"client_secret",
"github_feed_token"
"client_secret"
],
"builders": [
{
@@ -92,11 +90,6 @@
"source": "{{ template_dir }}/scripts/Tests",
"destination": "{{user `image_folder`}}"
},
{
"type": "file",
"source": "{{template_dir}}/toolsets/toolcache-2016.json",
"destination": "{{user `root_folder`}}/toolcache.json"
},
{
"type": "file",
"source": "{{template_dir}}/toolsets/toolset-2016.json",
@@ -226,12 +219,11 @@
{
"type": "powershell",
"environment_vars": [
"GITHUB_FEED_TOKEN={{ user `github_feed_token` }}",
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"ROOT_FOLDER={{user `root_folder`}}"
],
"scripts": [
"{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1",
"{{ template_dir }}/scripts/Installers/Install-Ruby.ps1",
"{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
"{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
"{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",