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

Merge pull request #1635 from hutson/refactor/formatting

Browse Source 
refactor: auto format JSON using VSC
This commit is contained in:
Maxim Lobanov
2020-09-27 13:26:25 +03:00
committed by GitHub
parent decb9c9b65 43d9476a37
commit e1bd620104
5 changed files with 111 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
images/linux/ubuntu1604.json
View File

@@ -24,7 +24,10 @@
"run_validation_diskspace": "false",
"announcements": "{{env `ANNOUNCEMENTS`}}"
},
"sensitive-variables": ["client_secret", "github_feed_token"],
"sensitive-variables": [
"client_secret",
"github_feed_token"
],
"builders": [
{
"type": "azure-arm",
@@ -32,7 +35,6 @@
"client_secret": "{{user `client_secret`}}",
"subscription_id": "{{user `subscription_id`}}",
"tenant_id": "{{user `tenant_id`}}",
"location": "{{user `location`}}",
"vm_size": "{{user `vm_size`}}",
"resource_group_name": "{{user `resource_group`}}",
@@ -62,7 +64,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/base/repos.sh"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
@@ -104,7 +106,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/preimagedata.sh"
],
"environment_vars": [
@@ -218,7 +220,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/Install-Toolset.ps1",
"{{template_dir}}/scripts/installers/Configure-Toolset.ps1",
"{{template_dir}}/scripts/installers/Validate-Toolset.ps1"
@@ -270,14 +272,14 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/cleanup.sh"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
],
"environment_vars": [
@@ -290,7 +292,7 @@
"inline": [
"pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
],
"environment_vars":[
"environment_vars": [
"IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}"
@@ -316,7 +318,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/validate-disk-space.sh"
],
"environment_vars": [

20
images/linux/ubuntu1804.json
View File

@@ -24,7 +24,10 @@
"run_validation_diskspace": "false",
"announcements": "{{env `ANNOUNCEMENTS`}}"
},
"sensitive-variables": ["client_secret", "github_feed_token"],
"sensitive-variables": [
"client_secret",
"github_feed_token"
],
"builders": [
{
"type": "azure-arm",
@@ -32,7 +35,6 @@
"client_secret": "{{user `client_secret`}}",
"subscription_id": "{{user `subscription_id`}}",
"tenant_id": "{{user `tenant_id`}}",
"location": "{{user `location`}}",
"vm_size": "{{user `vm_size`}}",
"resource_group_name": "{{user `resource_group`}}",
@@ -62,7 +64,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/base/repos.sh"
],
"environment_vars": [
@@ -107,7 +109,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/preimagedata.sh"
],
"environment_vars": [
@@ -222,7 +224,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/Install-Toolset.ps1",
"{{template_dir}}/scripts/installers/Configure-Toolset.ps1",
"{{template_dir}}/scripts/installers/Validate-Toolset.ps1"
@@ -274,14 +276,14 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/cleanup.sh"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
],
"environment_vars": [
@@ -294,7 +296,7 @@
"inline": [
"pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
],
"environment_vars":[
"environment_vars": [
"IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}"
@@ -320,7 +322,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/validate-disk-space.sh"
],
"environment_vars": [

18
images/linux/ubuntu2004.json
View File

@@ -26,7 +26,10 @@
"go_versions": "1.14",
"announcements": "{{env `ANNOUNCEMENTS`}}"
},
"sensitive-variables": ["client_secret", "github_feed_token"],
"sensitive-variables": [
"client_secret",
"github_feed_token"
],
"builders": [
{
"type": "azure-arm",
@@ -34,7 +37,6 @@
"client_secret": "{{user `client_secret`}}",
"subscription_id": "{{user `subscription_id`}}",
"tenant_id": "{{user `tenant_id`}}",
"location": "{{user `location`}}",
"vm_size": "{{user `vm_size`}}",
"resource_group_name": "{{user `resource_group`}}",
@@ -64,7 +66,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/base/repos.sh"
],
"environment_vars": [
@@ -109,7 +111,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/preimagedata.sh"
],
"environment_vars": [
@@ -224,7 +226,7 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/Install-Toolset.ps1",
"{{template_dir}}/scripts/installers/Configure-Toolset.ps1",
"{{template_dir}}/scripts/installers/Validate-Toolset.ps1"
@@ -276,14 +278,14 @@
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/cleanup.sh"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",
"scripts":[
"scripts": [
"{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
],
"environment_vars": [
@@ -296,7 +298,7 @@
"inline": [
"pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
],
"environment_vars":[
"environment_vars": [
"IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}"