From 39d85aa54fcfcbfe3b57ba80d664e62e68f291d6 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Tue, 17 Nov 2020 09:20:13 +0300
Subject: [PATCH] Remove announcements from generation

---
 images/macos/software-report/SoftwareReport.Generator.ps1 | 8 --------
 images/macos/templates/macOS-10.13.json                   | 6 +-----
 images/macos/templates/macOS-10.14.json                   | 6 +-----
 images/macos/templates/macOS-10.15.json                   | 6 +-----
 images/macos/templates/macOS-11.0.json                    | 6 +-----
 5 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 7d0ef369..a726e656 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -34,14 +34,6 @@ $juliaVersion = Run-Command "julia --version" | Take-Part -Part 0,2
 
 $markdown = ""
 
-# Get announcements
-if ($env:ANNOUNCEMENTS) {
-    $markdown += $env:ANNOUNCEMENTS
-    $markdown += New-MDNewLine
-    $markdown += "***"
-    $markdown += New-MDNewLine
-}
-
 # OS info
 $markdown += Build-OSInfoSection
 $markdown += New-MDList -Style Unordered -Lines ("Image Version: {0}" -f $ImageName.Split('_')[1])
diff --git a/images/macos/templates/macOS-10.13.json b/images/macos/templates/macOS-10.13.json
index 3eda456d..58b5427d 100644
--- a/images/macos/templates/macOS-10.13.json
+++ b/images/macos/templates/macOS-10.13.json
@@ -14,8 +14,7 @@
         "github_feed_token": null,
         "xcode_install_user": null,
         "xcode_install_password": null,
-        "image_os": "macos1013",
-        "announcements": "{{env `ANNOUNCEMENTS`}}"
+        "image_os": "macos1013"
     },
     "builders": [
         {
@@ -195,9 +194,6 @@
             "inline": [
                 "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
                 "pwsh -File \"$HOME/image-generation/tests/Run-Tests.ps1\" -WorkingDirectory \"$HOME/image-generation/tests\" -OutputFile \"$HOME/image-generation/output/tests/test-results.xml\""
-            ],
-            "environment_vars": [
-                "ANNOUNCEMENTS={{user `announcements`}}"
             ]
         },
         {
diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json
index 06e4dc7b..e2822693 100644
--- a/images/macos/templates/macOS-10.14.json
+++ b/images/macos/templates/macOS-10.14.json
@@ -14,8 +14,7 @@
         "github_feed_token": null,
         "xcode_install_user": null,
         "xcode_install_password": null,
-        "image_os": "macos1014",
-        "announcements": "{{env `ANNOUNCEMENTS`}}"
+        "image_os": "macos1014"
     },
     "builders": [
         {
@@ -215,9 +214,6 @@
             "inline": [
                 "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
                 "pwsh -File \"$HOME/image-generation/tests/Run-Tests.ps1\" -WorkingDirectory \"$HOME/image-generation/tests\" -OutputFile \"$HOME/image-generation/output/tests/test-results.xml\""
-            ],
-            "environment_vars": [
-                "ANNOUNCEMENTS={{user `announcements`}}"
             ]
         },
         {
diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json
index 554ad026..162af8bd 100644
--- a/images/macos/templates/macOS-10.15.json
+++ b/images/macos/templates/macOS-10.15.json
@@ -14,8 +14,7 @@
         "github_feed_token": null,
         "xcode_install_user": null,
         "xcode_install_password": null,
-        "image_os": "macos1015",
-        "announcements": "{{env `ANNOUNCEMENTS`}}"
+        "image_os": "macos1015"
     },
     "builders": [
         {
@@ -214,9 +213,6 @@
             "inline": [
                 "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
                 "pwsh -File \"$HOME/image-generation/tests/Run-Tests.ps1\" -WorkingDirectory \"$HOME/image-generation/tests\" -OutputFile \"$HOME/image-generation/output/tests/test-results.xml\""
-            ],
-            "environment_vars": [
-                "ANNOUNCEMENTS={{user `announcements`}}"
             ]
         },
         {
diff --git a/images/macos/templates/macOS-11.0.json b/images/macos/templates/macOS-11.0.json
index 2a9b691b..5586da94 100644
--- a/images/macos/templates/macOS-11.0.json
+++ b/images/macos/templates/macOS-11.0.json
@@ -14,8 +14,7 @@
         "github_feed_token": null,
         "xcode_install_user": null,
         "xcode_install_password": null,
-        "image_os": "macos11",
-        "announcements": "{{env `ANNOUNCEMENTS`}}"
+        "image_os": "macos11"
     },
     "builders": [
         {
@@ -210,9 +209,6 @@
             "inline": [
                 "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
                 "pwsh -File \"$HOME/image-generation/tests/Run-Tests.ps1\" -WorkingDirectory \"$HOME/image-generation/tests\" -OutputFile \"$HOME/image-generation/output/tests/test-results.xml\""
-            ],
-            "environment_vars": [
-                "ANNOUNCEMENTS={{user `announcements`}}"
             ]
         },
         {