actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 22:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ubuntu][windows] Remove announcements from generation (#2063)

Browse Source
This commit is contained in:
Vladimir Safonkin
2020-11-17 10:20:55 +03:00
committed by GitHub
parent a454d66e7f
commit 7dae76249b
8 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -21,13 +21,6 @@ Restore-UserOwner
$markdown = "" $markdown = ""
if ($env:ANNOUNCEMENTS) {
$markdown += $env:ANNOUNCEMENTS
$markdown += New-MDNewLine
$markdown += "***"
$markdown += New-MDNewLine
}
$OSName = Get-OSName $OSName = Get-OSName
$markdown += New-MDHeader "$OSName" -Level 1 $markdown += New-MDHeader "$OSName" -Level 1

6
images/linux/ubuntu1604.json
View File

@@ -21,8 +21,7 @@
"image_version": "dev", "image_version": "dev",
"image_os": "ubuntu16", "image_os": "ubuntu16",
"github_feed_token": null, "github_feed_token": null,
"run_validation_diskspace": "false", "run_validation_diskspace": "false"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": [ "sensitive-variables": [
"client_secret", "client_secret",
@@ -313,8 +312,7 @@
], ],
"environment_vars": [ "environment_vars": [
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
"ANNOUNCEMENTS={{user `announcements`}}"
] ]
}, },
{ {

6
images/linux/ubuntu1804.json
View File

@@ -21,8 +21,7 @@
"image_version": "dev", "image_version": "dev",
"image_os": "ubuntu18", "image_os": "ubuntu18",
"github_feed_token": null, "github_feed_token": null,
"run_validation_diskspace": "false", "run_validation_diskspace": "false"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": [ "sensitive-variables": [
"client_secret", "client_secret",
@@ -317,8 +316,7 @@
], ],
"environment_vars": [ "environment_vars": [
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
"ANNOUNCEMENTS={{user `announcements`}}"
] ]
}, },
{ {

6
images/linux/ubuntu2004.json
View File

@@ -23,8 +23,7 @@
"github_feed_token": null, "github_feed_token": null,
"run_validation_diskspace": "false", "run_validation_diskspace": "false",
"go_default": "1.14", "go_default": "1.14",
"go_versions": "1.14", "go_versions": "1.14"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": [ "sensitive-variables": [
"client_secret", "client_secret",
@@ -327,8 +326,7 @@
], ],
"environment_vars": [ "environment_vars": [
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
"ANNOUNCEMENTS={{user `announcements`}}"
] ]
}, },
{ {

3
images/win/announcements.md
View File

@@ -1,3 +0,0 @@
| Announcements |
|:-:|
| [Replace SVN (1.8.17) by TortoiseSVN (1.14.x) on Windows images](https://github.com/actions/virtual-environments/issues/1318) |

7
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -10,13 +10,6 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.VisualStudio.psm1") -Disa
$markdown = "" $markdown = ""
if ($env:ANNOUNCEMENTS) {
$markdown += $env:ANNOUNCEMENTS
$markdown += New-MDNewLine
$markdown += "***"
$markdown += New-MDNewLine
}
$OSName = Get-OSName $OSName = Get-OSName
$markdown += New-MDHeader "$OSName" -Level 1 $markdown += New-MDHeader "$OSName" -Level 1

6
images/win/windows2016.json
View File

@@ -26,8 +26,7 @@
"capture_name_prefix": "packer", "capture_name_prefix": "packer",
"image_version": "dev", "image_version": "dev",
"image_os": "win16", "image_os": "win16",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": [ "sensitive-variables": [
"install_password", "install_password",
@@ -362,8 +361,7 @@
"pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'"
], ],
"environment_vars": [ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
"ANNOUNCEMENTS={{user `announcements`}}"
] ]
}, },
{ {

6
images/win/windows2019.json
View File

@@ -26,8 +26,7 @@
"capture_name_prefix": "packer", "capture_name_prefix": "packer",
"image_version": "dev", "image_version": "dev",
"image_os": "win19", "image_os": "win19",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": [ "sensitive-variables": [
"install_password", "install_password",
@@ -360,8 +359,7 @@
"pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'"
], ],
"environment_vars": [ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
"ANNOUNCEMENTS={{user `announcements`}}"
] ]
}, },
{ {