[Mac OS] Adapt code for Mac OS 14 image #8760
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
erik-bershel
reviewed
Nov 7, 2023
| @@ -36,6 +36,7 @@ function Get-OSVersion { | |||
| IsMonterey = $osVersion.Version.Major -eq "12" | |||
| IsVentura = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -ne "arm64") | |||
| IsVenturaArm64 = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -eq "arm64") | |||
| IsSonoma = $($osVersion.Version.Major -eq "14") | |||
There was a problem hiding this comment.
How about to check here architecture? Since we already know what changes will follow this.
There was a problem hiding this comment.
No, I think it’s irrelevant until there’s a reason to check it, but for now there isn’t one.
There was a problem hiding this comment.
Well, it's a good point, but I'm already proceed with building arm image and going to update this part in the next PR.
erik-bershel
approved these changes
Nov 7, 2023
Alexey-Ayupov
approved these changes
Nov 8, 2023
mikhailkoliada
added a commit
that referenced
this pull request
Nov 14, 2023
* [MacOS] Add xcode 15.0.1 (#8604) * Updating readme file for macos-13 version 20231018.14 (#8601) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for macos-13-arm64 version 20231017.1 (#8586) Co-authored-by: Image generation service account <no-reply@microsoft.com> * [MacOS] improve errexit option handling (#8432) * [MacOS] improve errexit option handling * Prevent prompting for override when unzipping * Explicitly allow failing when installing virtualbox * Remove libtcl symlinks * Add debug output * Updating readme file for ubuntu20 version 20231022.1.1 (#8637) Co-authored-by: Image generation service account <no-reply@microsoft.com> * Updating readme file for ubuntu22 version 20231022.1.1 (#8636) Co-authored-by: Image generation service account <no-reply@microsoft.com> * Updating readme file for win19 version 20231023.1.1 (#8644) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win22 version 20231023.1.1 (#8643) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * [macos] simplify "brew_smart_install" helper (#8639) * [macos] homebrew: use hardcoded condition for jq installation we cannot use "jq" if we are asked to install "jq" * [macos] always use "brew install" * [macos] add retries to "get_github_package_download_url" helper * [macos] add retries to chrome install script * [macos] add retries to OpenJDK install script * [macos] add retries to miniconda installer * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * fix copy-paste error * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --------- Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * Updating readme file for ubuntu22 version 20231025.1.1 (#8663) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for ubuntu20 version 20231025.1.1 (#8664) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win22 version 20231024.1.1 (#8668) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Windows Server 2019 (20231025) Image Update (#8667) * Updating readme file for win19 version 20231025.2.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> * [Mac OS] Fix logic for retrying AppleScript execution (#8662) * [Ubuntu] Add PGP validation for swift (#8652) * [Windows] Remove out-of-support vs components (#8678) * [MacOS] Unpin Virtualbox (#8653) * [MacOS] Unpin Virtualbox * Remove obsolete virtualbox kext pester test * [Ubuntu] Update apt repos list in documentation (#8634) * fix: bump libssl version to ubuntu2.20 (#8682) Signed-off-by: Jakub Oskera <iam@jakuboskera.dev> Co-authored-by: Jakub Oskera <jakub.oskera@rws.com> * [macOS] increase timeout for the macOS ci (#8692) * Updating readme file for macos-13-arm64 version 20231024.2 (#8673) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Escape quotes when running in PowerShell 7.0-7.2 (#8705) * fix: checksum search for Kotlin (#8704) * [Ubuntu] Fix checksum search for Kotlin * [Windows] Fixed checksum search for Kotlin * [Ubuntu] Pin bindgen cli version to avoid bug (#8714) * [Ubuntu] Add more checksum validations (#8660) * [Windows] Pin bindgen cli version to avoid bug (#8713) * Updating readme file for ubuntu22 version 20231030.2.1 (#8691) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for ubuntu20 version 20231030.2.1 (#8690) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win19 version 20231029.1.1 (#8687) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Revert "[Windows] Pin bindgen cli version to avoid bug (#8713)" (#8719) This reverts commit 1dac9b9. * Revert "[Ubuntu] Pin bindgen cli version to avoid bug (#8714)" (#8720) This reverts commit 3146c70. * [Mac OS] Temporary disable VNC for Mac OS 14 (#8717) * Updating readme file for win22 version 20231029.1.1 (#8686) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for macOS-11 version 20231030.1 (#8694) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * [Mac OS] Add template for Mac OS 14 image (#8733) * Add gfortran-13 (#8702) * Revert "[MacOS] Unpin Virtualbox" (#8731) * Revert "[MacOS] Unpin Virtualbox (#8653)" This reverts commit f3d011e. * Add more info * [ubuntu] split git and git-lfs into separate install scripts (#8711) for better observability of integrity validation let us split install script into two * Updating readme file for macOS-12 version 20231029.1 (#8695) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * [Windows] Remove Android SDK Patch applier v4 (#8750) * remove ndk 23 from macos images (#8747) * [Mac OS] Remove 'LTS' suffix from OpenJDK version (#8751) * [windows] split docker install into 3 scripts (#8688) * [windows] split docker install into 3 scripts the idea is to end with 1 script per 1 component for better observability * Update images/win/scripts/Installers/Install-Docker-Compose.ps1 Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> * Update images/win/scripts/Installers/Install-Docker-WinCred.ps1 Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * fix test --------- Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * remove ndk 23 from ubuntu images (#8745) * [macos] add android SDK to SW report on Ventura ARM64 (#8715) * [Mac OS] Update Anka Helpers to build Mac OS 14 ARM image (#8757) * Update Anka Helpers to build Mac OS 14 ARM image * Drop Powershell 5 support * [Mac OS] Add missing macOS Sonoma selector (#8759) * remove ndk23 from windows images (#8746) * Updating readme file for macos-13 version 20231025.2 (#8672) Co-authored-by: Image generation service account <no-reply@microsoft.com> * [Mac OS] Adapt code for Mac OS 14 image (#8760) * [Mac OS] Add newer versions of Go and Node.js (#8752) * Fix macOS 13 arm64 software update part (#8772) Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> * [Ubuntu] add runner-package to curated images (#8474) * [macOS] Add AWS cli to the macOS 13 arm64 (#8774) Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> * Adjust services handling in Finalize-VM and helpers (#8771) * [Windows] Set user agent header to get mysql patch version (#8773) * add runner install script for windows image (#8671) * [macOS] Remove Haskell and Cargo packages (#8775) Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> * [Mac OS] Configure template for Mac OS 14 ARM64 image (#8769) * Configure template for Mac OS 14 ARM64 image * Change conditions for ruby * [macos11] Unlink brew ghc and cabal-install (#8778) * utils.sh: make brew_smart_install verbose (#8780) --------- Signed-off-by: Jakub Oskera <iam@jakuboskera.dev> Co-authored-by: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> Co-authored-by: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Jakub Oskera <iam@jakuboskera.dev> Co-authored-by: Jakub Oskera <jakub.oskera@rws.com> Co-authored-by: Luke Fritts <luketfritts@gmail.com> Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com> Co-authored-by: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> Co-authored-by: Peter Shepehrd <109117968+pshepherd10@users.noreply.github.com> Co-authored-by: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com>
mikhailkoliada
added a commit
that referenced
this pull request
Nov 14, 2023
* [MacOS] Add xcode 15.0.1 (#8604) * Updating readme file for macos-13 version 20231018.14 (#8601) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for macos-13-arm64 version 20231017.1 (#8586) Co-authored-by: Image generation service account <no-reply@microsoft.com> * [MacOS] improve errexit option handling (#8432) * [MacOS] improve errexit option handling * Prevent prompting for override when unzipping * Explicitly allow failing when installing virtualbox * Remove libtcl symlinks * Add debug output * Updating readme file for ubuntu20 version 20231022.1.1 (#8637) Co-authored-by: Image generation service account <no-reply@microsoft.com> * Updating readme file for ubuntu22 version 20231022.1.1 (#8636) Co-authored-by: Image generation service account <no-reply@microsoft.com> * Updating readme file for win19 version 20231023.1.1 (#8644) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win22 version 20231023.1.1 (#8643) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * [macos] simplify "brew_smart_install" helper (#8639) * [macos] homebrew: use hardcoded condition for jq installation we cannot use "jq" if we are asked to install "jq" * [macos] always use "brew install" * [macos] add retries to "get_github_package_download_url" helper * [macos] add retries to chrome install script * [macos] add retries to OpenJDK install script * [macos] add retries to miniconda installer * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * fix copy-paste error * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --------- Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * Updating readme file for ubuntu22 version 20231025.1.1 (#8663) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for ubuntu20 version 20231025.1.1 (#8664) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win22 version 20231024.1.1 (#8668) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Windows Server 2019 (20231025) Image Update (#8667) * Updating readme file for win19 version 20231025.2.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> * [Mac OS] Fix logic for retrying AppleScript execution (#8662) * [Ubuntu] Add PGP validation for swift (#8652) * [Windows] Remove out-of-support vs components (#8678) * [MacOS] Unpin Virtualbox (#8653) * [MacOS] Unpin Virtualbox * Remove obsolete virtualbox kext pester test * [Ubuntu] Update apt repos list in documentation (#8634) * fix: bump libssl version to ubuntu2.20 (#8682) Signed-off-by: Jakub Oskera <iam@jakuboskera.dev> Co-authored-by: Jakub Oskera <jakub.oskera@rws.com> * [macOS] increase timeout for the macOS ci (#8692) * Updating readme file for macos-13-arm64 version 20231024.2 (#8673) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Escape quotes when running in PowerShell 7.0-7.2 (#8705) * fix: checksum search for Kotlin (#8704) * [Ubuntu] Fix checksum search for Kotlin * [Windows] Fixed checksum search for Kotlin * [Ubuntu] Pin bindgen cli version to avoid bug (#8714) * [Ubuntu] Add more checksum validations (#8660) * [Windows] Pin bindgen cli version to avoid bug (#8713) * Updating readme file for ubuntu22 version 20231030.2.1 (#8691) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for ubuntu20 version 20231030.2.1 (#8690) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win19 version 20231029.1.1 (#8687) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Revert "[Windows] Pin bindgen cli version to avoid bug (#8713)" (#8719) This reverts commit 1dac9b9. * Revert "[Ubuntu] Pin bindgen cli version to avoid bug (#8714)" (#8720) This reverts commit 3146c70. * [Mac OS] Temporary disable VNC for Mac OS 14 (#8717) * Updating readme file for win22 version 20231029.1.1 (#8686) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for macOS-11 version 20231030.1 (#8694) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * [Mac OS] Add template for Mac OS 14 image (#8733) * Add gfortran-13 (#8702) * Revert "[MacOS] Unpin Virtualbox" (#8731) * Revert "[MacOS] Unpin Virtualbox (#8653)" This reverts commit f3d011e. * Add more info * [ubuntu] split git and git-lfs into separate install scripts (#8711) for better observability of integrity validation let us split install script into two * Updating readme file for macOS-12 version 20231029.1 (#8695) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * [Windows] Remove Android SDK Patch applier v4 (#8750) * remove ndk 23 from macos images (#8747) * [Mac OS] Remove 'LTS' suffix from OpenJDK version (#8751) * [windows] split docker install into 3 scripts (#8688) * [windows] split docker install into 3 scripts the idea is to end with 1 script per 1 component for better observability * Update images/win/scripts/Installers/Install-Docker-Compose.ps1 Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> * Update images/win/scripts/Installers/Install-Docker-WinCred.ps1 Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * fix test --------- Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * remove ndk 23 from ubuntu images (#8745) * [macos] add android SDK to SW report on Ventura ARM64 (#8715) * [Mac OS] Update Anka Helpers to build Mac OS 14 ARM image (#8757) * Update Anka Helpers to build Mac OS 14 ARM image * Drop Powershell 5 support * [Mac OS] Add missing macOS Sonoma selector (#8759) * remove ndk23 from windows images (#8746) * Updating readme file for macos-13 version 20231025.2 (#8672) Co-authored-by: Image generation service account <no-reply@microsoft.com> * [Mac OS] Adapt code for Mac OS 14 image (#8760) * [Mac OS] Add newer versions of Go and Node.js (#8752) * Fix macOS 13 arm64 software update part (#8772) Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> * [Ubuntu] add runner-package to curated images (#8474) * [macOS] Add AWS cli to the macOS 13 arm64 (#8774) Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> * Adjust services handling in Finalize-VM and helpers (#8771) * [Windows] Set user agent header to get mysql patch version (#8773) * add runner install script for windows image (#8671) * [macOS] Remove Haskell and Cargo packages (#8775) Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> * [Mac OS] Configure template for Mac OS 14 ARM64 image (#8769) * Configure template for Mac OS 14 ARM64 image * Change conditions for ruby * [macos11] Unlink brew ghc and cabal-install (#8778) * utils.sh: make brew_smart_install verbose (#8780) * [macOS] Exclude macOS 13 and 14 from "Stack" test (#8787) Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> * Update folder structure * Adjust packer templates and debug * Fix issues in ubuntu2204 template * Remove Debug steps * Rename template, sync pipelines and adjust resource gen script * fix post-gen path in ubuntu-minimal * fix shebang linter, workflow paths and adjust readme * update preimagedata --------- Signed-off-by: Jakub Oskera <iam@jakuboskera.dev> Co-authored-by: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Co-authored-by: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Jakub Oskera <iam@jakuboskera.dev> Co-authored-by: Jakub Oskera <jakub.oskera@rws.com> Co-authored-by: Luke Fritts <luketfritts@gmail.com> Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com> Co-authored-by: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> Co-authored-by: Peter Shepehrd <109117968+pshepherd10@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pull request includes a variety of changes to support the new macOS Sonoma operating system. The most important changes include adding support for Sonoma to various functions, skipping certain tests on macOS Sonoma , and modifying the software report to exclude certain tools and sections on macOS Sonoma.
Related issue: https://github.com/actions/runner-images-internal/issues/5568
Check list