diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-04 21:13:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-04 21:13:47 +0300 |
| commit | cc514c362bcd4b657bf6a6d1d37f5305952df363 (patch) | |
| tree | 695c721b87c573d843cfeb23be2183d65b8a9785 /doc/ci | |
| parent | 7de116050af7a190085c01bbf819e48e708e8eb2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/runners/saas/macos_saas_runner.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/ci/runners/saas/macos_saas_runner.md b/doc/ci/runners/saas/macos_saas_runner.md index 03c23680c1c..0251c523864 100644 --- a/doc/ci/runners/saas/macos_saas_runner.md +++ b/doc/ci/runners/saas/macos_saas_runner.md @@ -21,8 +21,7 @@ You can follow our work towards this goal in the ## Machine types available for macOS -GitLab SaaS provides macOS build machines on Apple silicon (M1) chips. -Intel x86-64 runners were deprecated in favor of Apple silicon. To build for an x86-64 target, use Rosetta 2 to emulate an Intel x86-64 build environment. +GitLab SaaS provides macOS build machines on Apple silicon (M1) chips. To build for an x86-64 target, you can use Rosetta 2 to emulate an Intel x86-64 build environment. | Runner Tag | vCPUS | Memory | Storage | | ---------------------- | ----- | ------ | ------- | @@ -40,7 +39,7 @@ in your `.gitlab-ci.yml` file. Each image runs a specific version of macOS and X |----------------------------|--------|--------------| | `macos-12-xcode-14` | `GA` | | | `macos-13-xcode-14` | `GA` | [Preinstalled Software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/blob/main/toolchain/macos-13.yml) | -| `macos-14-xcode-15` | `Beta` | [Preinstalled Software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/blob/main/toolchain/macos-14.yml) | +| `macos-14-xcode-15` | `GA` | [Preinstalled Software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/blob/main/toolchain/macos-14.yml) | If no image is specified, the macOS runner uses `macos-13-xcode-14`. |