actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2077 from vsafonkin/v-vlsafo/macos-remove-announcements-from-generation

Browse Source 
[macOS] Remove announcements from generation process
This commit is contained in:
Maxim Lobanov
2020-11-18 09:36:58 +03:00
committed by GitHub
parent 7a511f87bf 3397eaff41
commit f305ea6355
5 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -34,14 +34,6 @@ $juliaVersion = Run-Command "julia --version" | Take-Part -Part 0,2
$markdown = "" $markdown = ""
# Get announcements
if ($env:ANNOUNCEMENTS) {
$markdown += $env:ANNOUNCEMENTS
$markdown += New-MDNewLine
$markdown += "***"
$markdown += New-MDNewLine
}
# OS info # OS info
$markdown += Build-OSInfoSection $markdown += Build-OSInfoSection
$markdown += New-MDList -Style Unordered -Lines ("Image Version: {0}" -f $ImageName.Split('_')[1]) $markdown += New-MDList -Style Unordered -Lines ("Image Version: {0}" -f $ImageName.Split('_')[1])

6
images/macos/templates/macOS-10.13.json
View File

@@ -14,8 +14,7 @@
"github_feed_token": null, "github_feed_token": null,
"xcode_install_user": null, "xcode_install_user": null,
"xcode_install_password": null, "xcode_install_password": null,
"image_os": "macos1013", "image_os": "macos1013"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"builders": [ "builders": [
{ {
@@ -195,9 +194,6 @@
"inline": [ "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/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\"" "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`}}"
] ]
}, },
{ {

6
images/macos/templates/macOS-10.14.json
View File

@@ -14,8 +14,7 @@
"github_feed_token": null, "github_feed_token": null,
"xcode_install_user": null, "xcode_install_user": null,
"xcode_install_password": null, "xcode_install_password": null,
"image_os": "macos1014", "image_os": "macos1014"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"builders": [ "builders": [
{ {
@@ -215,9 +214,6 @@
"inline": [ "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/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\"" "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`}}"
] ]
}, },
{ {

6
images/macos/templates/macOS-10.15.json
View File

@@ -14,8 +14,7 @@
"github_feed_token": null, "github_feed_token": null,
"xcode_install_user": null, "xcode_install_user": null,
"xcode_install_password": null, "xcode_install_password": null,
"image_os": "macos1015", "image_os": "macos1015"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"builders": [ "builders": [
{ {
@@ -214,9 +213,6 @@
"inline": [ "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/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\"" "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`}}"
] ]
}, },
{ {

6
images/macos/templates/macOS-11.0.json
View File

@@ -14,8 +14,7 @@
"github_feed_token": null, "github_feed_token": null,
"xcode_install_user": null, "xcode_install_user": null,
"xcode_install_password": null, "xcode_install_password": null,
"image_os": "macos11", "image_os": "macos11"
"announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"builders": [ "builders": [
{ {
@@ -210,9 +209,6 @@
"inline": [ "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/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\"" "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`}}"
] ]
}, },
{ {