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

[macOS] Update output files (#13344)

Browse Source 
* [macOS] Update output files

* Upd cofigure-system.sh to work with new name pattern
This commit is contained in:
Erik Bershel
2025-11-25 12:35:29 +01:00
committed by GitHub
parent 20d9e86d33
commit 0d358721af
7 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/macos/scripts/build/configure-system.sh
View File

@@ -47,7 +47,7 @@ xcrun simctl list > /dev/null
xcrun simctl list devices > /dev/null xcrun simctl list devices > /dev/null
echo "Put documentation to $HOME root" echo "Put documentation to $HOME root"
cp $HOME/image-generation/output/software-report/systeminfo.* $HOME/ cp $HOME/image-generation/output/software-report.* $HOME/
echo "Remove fastlane cached cookie" echo "Remove fastlane cached cookie"
rm -rf ~/.fastlane rm -rf ~/.fastlane

4
images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -200,5 +200,5 @@ if (-not (Test-Path $OutputDirectory)) { New-Item -Path $OutputDirectory -ItemTy
# Write final reports # Write final reports
# #
Write-Host $markdownExtended Write-Host $markdownExtended
$softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/systeminfo.json" -Encoding UTF8NoBOM $softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/software-report.json" -Encoding UTF8NoBOM
$softwareReport.ToMarkdown() | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM $softwareReport.ToMarkdown() | Out-File -FilePath "${OutputDirectory}/software-report.md" -Encoding UTF8NoBOM

12
images/macos/templates/macOS-14.anka.pkr.hcl
View File

@@ -274,15 +274,21 @@ build {
environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] environment_vars = ["IMAGE_FOLDER=${local.image_folder}"]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
inline = [ inline = [
"pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output\" -ImageName ${var.build_id}",
"pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\""
] ]
} }
provisioner "file" { provisioner "file" {
destination = "${path.root}/../../image-output/" destination = "${path.root}/../../image-output/macos-14-Readme.md"
direction = "download" direction = "download"
source = "${local.image_folder}/output/" source = "${local.image_folder}/output/software-report.md"
}
provisioner "file" {
destination = "${path.root}/../../image-output/software-report.json"
direction = "download"
source = "${local.image_folder}/output/software-report.json"
} }
provisioner "shell" { provisioner "shell" {

12
images/macos/templates/macOS-14.arm64.anka.pkr.hcl
View File

@@ -273,15 +273,21 @@ build {
environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] environment_vars = ["IMAGE_FOLDER=${local.image_folder}"]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
inline = [ inline = [
"pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output\" -ImageName ${var.build_id}",
"pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\""
] ]
} }
provisioner "file" { provisioner "file" {
destination = "${path.root}/../../image-output/" destination = "${path.root}/../../image-output/macos-14-arm64-Readme.md"
direction = "download" direction = "download"
source = "${local.image_folder}/output/" source = "${local.image_folder}/output/software-report.md"
}
provisioner "file" {
destination = "${path.root}/../../image-output/software-report.json"
direction = "download"
source = "${local.image_folder}/output/software-report.json"
} }
provisioner "shell" { provisioner "shell" {

12
images/macos/templates/macOS-15.anka.pkr.hcl
View File

@@ -273,15 +273,21 @@ build {
environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] environment_vars = ["IMAGE_FOLDER=${local.image_folder}"]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
inline = [ inline = [
"pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output\" -ImageName ${var.build_id}",
"pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\""
] ]
} }
provisioner "file" { provisioner "file" {
destination = "${path.root}/../../image-output/" destination = "${path.root}/../../image-output/macos-15-Readme.md"
direction = "download" direction = "download"
source = "${local.image_folder}/output/" source = "${local.image_folder}/output/software-report.md"
}
provisioner "file" {
destination = "${path.root}/../../image-output/software-report.json"
direction = "download"
source = "${local.image_folder}/output/software-report.json"
} }
provisioner "shell" { provisioner "shell" {

12
images/macos/templates/macOS-15.arm64.anka.pkr.hcl
View File

@@ -272,15 +272,21 @@ build {
environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] environment_vars = ["IMAGE_FOLDER=${local.image_folder}"]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
inline = [ inline = [
"pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output\" -ImageName ${var.build_id}",
"pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\""
] ]
} }
provisioner "file" { provisioner "file" {
destination = "${path.root}/../../image-output/" destination = "${path.root}/../../image-output/macos-15-arm64-Readme.md"
direction = "download" direction = "download"
source = "${local.image_folder}/output/" source = "${local.image_folder}/output/software-report.md"
}
provisioner "file" {
destination = "${path.root}/../../image-output/software-report.json"
direction = "download"
source = "${local.image_folder}/output/software-report.json"
} }
provisioner "shell" { provisioner "shell" {

12
images/macos/templates/macOS-26.arm64.anka.pkr.hcl
View File

@@ -271,15 +271,21 @@ build {
environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] environment_vars = ["IMAGE_FOLDER=${local.image_folder}"]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
inline = [ inline = [
"pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output\" -ImageName ${var.build_id}",
"pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\""
] ]
} }
provisioner "file" { provisioner "file" {
destination = "${path.root}/../../image-output/" destination = "${path.root}/../../image-output/macos-26-arm64-Readme.md"
direction = "download" direction = "download"
source = "${local.image_folder}/output/" source = "${local.image_folder}/output/software-report.md"
}
provisioner "file" {
destination = "${path.root}/../../image-output/software-report.json"
direction = "download"
source = "${local.image_folder}/output/software-report.json"
} }
provisioner "shell" { provisioner "shell" {