From 7dae76249bba63fe289d9e4d97b9542fa6a4f784 Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Tue, 17 Nov 2020 10:20:55 +0300 Subject: [PATCH] [ubuntu][windows] Remove announcements from generation (#2063) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 7 ------- images/linux/ubuntu1604.json | 6 ++---- images/linux/ubuntu1804.json | 6 ++---- images/linux/ubuntu2004.json | 6 ++---- images/win/announcements.md | 3 --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 7 ------- images/win/windows2016.json | 6 ++---- images/win/windows2019.json | 6 ++---- 8 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 images/win/announcements.md diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 4230ea835..a67a56bd4 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -21,13 +21,6 @@ Restore-UserOwner $markdown = "" -if ($env:ANNOUNCEMENTS) { - $markdown += $env:ANNOUNCEMENTS - $markdown += New-MDNewLine - $markdown += "***" - $markdown += New-MDNewLine -} - $OSName = Get-OSName $markdown += New-MDHeader "$OSName" -Level 1 diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index d96118dbd..a6bb1f428 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -21,8 +21,7 @@ "image_version": "dev", "image_os": "ubuntu16", "github_feed_token": null, - "run_validation_diskspace": "false", - "announcements": "{{env `ANNOUNCEMENTS`}}" + "run_validation_diskspace": "false" }, "sensitive-variables": [ "client_secret", @@ -313,8 +312,7 @@ ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "ANNOUNCEMENTS={{user `announcements`}}" + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" ] }, { diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 417856881..97237827f 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -21,8 +21,7 @@ "image_version": "dev", "image_os": "ubuntu18", "github_feed_token": null, - "run_validation_diskspace": "false", - "announcements": "{{env `ANNOUNCEMENTS`}}" + "run_validation_diskspace": "false" }, "sensitive-variables": [ "client_secret", @@ -317,8 +316,7 @@ ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "ANNOUNCEMENTS={{user `announcements`}}" + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" ] }, { diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index fb44a04fb..2866181f0 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -23,8 +23,7 @@ "github_feed_token": null, "run_validation_diskspace": "false", "go_default": "1.14", - "go_versions": "1.14", - "announcements": "{{env `ANNOUNCEMENTS`}}" + "go_versions": "1.14" }, "sensitive-variables": [ "client_secret", @@ -327,8 +326,7 @@ ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "ANNOUNCEMENTS={{user `announcements`}}" + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" ] }, { diff --git a/images/win/announcements.md b/images/win/announcements.md deleted file mode 100644 index 7b462ebc8..000000000 --- a/images/win/announcements.md +++ /dev/null @@ -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) | diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 91c19dc6f..9439c1ed0 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -10,13 +10,6 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.VisualStudio.psm1") -Disa $markdown = "" -if ($env:ANNOUNCEMENTS) { - $markdown += $env:ANNOUNCEMENTS - $markdown += New-MDNewLine - $markdown += "***" - $markdown += New-MDNewLine -} - $OSName = Get-OSName $markdown += New-MDHeader "$OSName" -Level 1 diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 13cdc4a76..70828402e 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -26,8 +26,7 @@ "capture_name_prefix": "packer", "image_version": "dev", "image_os": "win16", - "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", - "announcements": "{{env `ANNOUNCEMENTS`}}" + "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}" }, "sensitive-variables": [ "install_password", @@ -362,8 +361,7 @@ "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" ], "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "ANNOUNCEMENTS={{user `announcements`}}" + "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ] }, { diff --git a/images/win/windows2019.json b/images/win/windows2019.json index f2c230bf7..c791b2c07 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -26,8 +26,7 @@ "capture_name_prefix": "packer", "image_version": "dev", "image_os": "win19", - "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", - "announcements": "{{env `ANNOUNCEMENTS`}}" + "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}" }, "sensitive-variables": [ "install_password", @@ -360,8 +359,7 @@ "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" ], "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "ANNOUNCEMENTS={{user `announcements`}}" + "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ] }, {