actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-06 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[macos] refactor XCode installation approach (#7858)

Browse Source 
* [macos] refactor XCode installation approach

xcversion does not work anymore, we are switching to storing
XCode installers in intermediate Azure storage

* remove xcode_install_user, xcode_install_password

* rename xcode_install_storage --> xcode_install_storage_url

* mark xcode installation variables sensitive

* remove xcversion_auth_cookie variable

* renamed forgotten xcode_install_storage --> xcode_install_storage_url

* remove leftover xcode_install_user
This commit is contained in:
ilia-shipitsin
2023-07-06 11:36:08 +02:00
committed by GitHub
parent 406a7844ab
commit 63b7bc4bde
13 changed files with 57 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
images/macos/templates/macOS-13.arm64.anka.pkr.hcl
View File

@@ -34,21 +34,16 @@ variable "github_api_pat" {
default = ""
}
variable "xcode_install_user" {
variable "xcode_install_storage_url" {
type = string
sensitive = true
}
variable "xcode_install_password" {
variable "xcode_install_sas" {
type = string
sensitive = true
}
variable "xcversion_auth_cookie" {
type = string
default = ""
}
variable "vcpu_count" {
type = string
default = "6"
@@ -182,17 +177,11 @@ build {
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
inline = [
"mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}",
"echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
]
}
provisioner "shell" {
script = "./provision/core/xcode.ps1"
environment_vars = [
"XCODE_INSTALL_USER=${var.xcode_install_user}",
"XCODE_INSTALL_PASSWORD=${var.xcode_install_password}"
"XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}",
"XCODE_INSTALL_SAS=${var.xcode_install_sas}"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}