[macOS] Implement new directories hierarchy (#8741)

This commit is contained in:
Shamil Mubarakshin
2023-11-15 12:12:28 +01:00
committed by GitHub
parent 5d40b1e213
commit 8d6a01b370
133 changed files with 1713 additions and 1677 deletions

View File

@@ -81,31 +81,27 @@ build {
provisioner "file" {
destination = "image-generation/"
sources = [
"./provision/assets",
"./tests",
"./software-report",
"./helpers"
"./assets/xamarin-selector",
"./scripts/tests",
"./scripts/docs-gen",
"./scripts/helpers"
]
}
provisioner "file" {
destination = "image-generation/software-report/"
destination = "image-generation/docs-gen/"
source = "../../helpers/software-report-base"
}
provisioner "file" {
destination = "image-generation/add-certificate.swift"
source = "./provision/configuration/add-certificate.swift"
source = "./assets/add-certificate.swift"
}
provisioner "file" {
destination = ".bashrc"
source = "./provision/configuration/environment/bashrc"
source = "./assets/bashrc"
}
provisioner "file" {
destination = ".bash_profile"
source = "./provision/configuration/environment/bashprofile"
}
provisioner "file" {
destination = "./"
source = "./provision/utils"
source = "./assets/bashprofile"
}
provisioner "shell" {
inline = [
@@ -114,26 +110,38 @@ build {
}
provisioner "file" {
destination = "bootstrap"
source = "./provision/bootstrap-provisioner/"
source = "./assets/bootstrap-provisioner/"
}
provisioner "file" {
destination = "image-generation/toolset.json"
source = "./toolsets/toolset-13.json"
}
provisioner "shell" {
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
inline = [
"mv ~/image-generation/docs-gen ~/image-generation/software-report",
"mv ~/image-generation/xamarin-selector ~/image-generation/assets",
"mkdir ~/utils",
"mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils",
"mv ~/image-generation/helpers/invoke-tests.sh ~/utils",
"mv ~/image-generation/helpers/utils.sh ~/utils",
"mv ~/image-generation/helpers/xamarin-utils.sh ~/utils"
]
}
provisioner "shell" {
scripts = [
"./provision/core/xcode-clt.sh",
"./provision/core/homebrew.sh",
"./provision/core/rosetta.sh"
"./scripts/build/xcode-clt.sh",
"./scripts/build/homebrew.sh",
"./scripts/build/rosetta.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
scripts = [
"./provision/configuration/configure-tccdb-macos.sh",
"./provision/configuration/disable-auto-updates.sh",
"./provision/configuration/ntpconf.sh",
"./provision/configuration/shell-change.sh"
"./scripts/build/configure-tccdb-macos.sh",
"./scripts/build/disable-auto-updates.sh",
"./scripts/build/ntpconf.sh",
"./scripts/build/shell-change.sh"
]
environment_vars = [
"PASSWORD=${var.vm_password}",
@@ -143,9 +151,9 @@ build {
}
provisioner "shell" {
scripts = [
"./provision/configuration/preimagedata.sh",
"./provision/configuration/configure-ssh.sh",
"./provision/configuration/configure-machine.sh"
"./scripts/build/preimagedata.sh",
"./scripts/build/configure-ssh.sh",
"./scripts/build/configure-machine.sh"
]
environment_vars = [
"IMAGE_VERSION=${var.build_id}",
@@ -155,24 +163,24 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
script = "./provision/core/reboot.sh"
script = "./scripts/build/reboot.sh"
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
}
provisioner "shell" {
pause_before = "30s"
scripts = [
"./provision/core/open_windows_check.sh",
"./provision/core/powershell.sh",
"./provision/core/mono.sh",
"./provision/core/dotnet.sh",
"./provision/core/azcopy.sh",
"./provision/core/openssl.sh",
"./provision/core/ruby.sh",
"./provision/core/rubygem.sh",
"./provision/core/git.sh",
"./provision/core/node.sh",
"./provision/core/commonutils.sh"
"./scripts/build/open_windows_check.sh",
"./scripts/build/powershell.sh",
"./scripts/build/mono.sh",
"./scripts/build/dotnet.sh",
"./scripts/build/azcopy.sh",
"./scripts/build/openssl.sh",
"./scripts/build/ruby.sh",
"./scripts/build/rubygem.sh",
"./scripts/build/git.sh",
"./scripts/build/node.sh",
"./scripts/build/commonutils.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}",
@@ -181,7 +189,7 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
script = "./provision/core/xcode.ps1"
script = "./scripts/build/xcode.ps1"
environment_vars = [
"XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}",
"XCODE_INSTALL_SAS=${var.xcode_install_sas}"
@@ -189,24 +197,24 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
script = "./provision/core/reboot.sh"
script = "./scripts/build/reboot.sh"
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
}
provisioner "shell" {
scripts = [
"./provision/core/action-archive-cache.sh",
"./provision/core/llvm.sh",
"./provision/core/openjdk.sh",
"./provision/core/aws.sh",
"./provision/core/rust.sh",
"./provision/core/gcc.sh",
"./provision/core/cocoapods.sh",
"./provision/core/android-toolsets.sh",
"./provision/core/safari.sh",
"./provision/core/chrome.sh",
"./provision/core/bicep.sh",
"./provision/core/codeql-bundle.sh"
"./scripts/build/action-archive-cache.sh",
"./scripts/build/llvm.sh",
"./scripts/build/openjdk.sh",
"./scripts/build/aws.sh",
"./scripts/build/rust.sh",
"./scripts/build/gcc.sh",
"./scripts/build/cocoapods.sh",
"./scripts/build/android-toolsets.sh",
"./scripts/build/safari.sh",
"./scripts/build/chrome.sh",
"./scripts/build/bicep.sh",
"./scripts/build/codeql-bundle.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}"
@@ -215,13 +223,13 @@ build {
}
provisioner "shell" {
scripts = [
"./provision/core/toolset.ps1",
"./provision/core/configure-toolset.ps1"
"./scripts/build/toolset.ps1",
"./scripts/build/configure-toolset.ps1"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
script = "./provision/core/delete-duplicate-sims.rb"
script = "./scripts/build/delete-duplicate-sims.rb"
execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}"
}
provisioner "shell" {
@@ -238,7 +246,7 @@ build {
}
provisioner "shell" {
scripts = [
"./provision/configuration/configure-hostname.sh"
"./scripts/build/configure-hostname.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}