From 73adc912c74e69c579bea00881d286d2b3e1e632 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Thu, 30 May 2024 11:44:06 -0700 Subject: [PATCH] Move up macos and xcode version --- eng/pipelines/templates/stages/platform-matrix-live.json | 2 +- eng/pipelines/templates/stages/platform-matrix.json | 4 ++-- eng/pipelines/templates/variables/image.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json index 185a96270..be75738e6 100644 --- a/eng/pipelines/templates/stages/platform-matrix-live.json +++ b/eng/pipelines/templates/stages/platform-matrix-live.json @@ -5,7 +5,7 @@ "include": [ { "StaticConfigs": { - "macOS-11": { + "macOS-14": { "Pool": "env:MACPOOL", "OSVmImage": "env:MACVMIMAGE", "VCPKG_DEFAULT_TRIPLET": "x64-osx", diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index cdc5c3394..84b4393da 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -5,9 +5,9 @@ "include": [ { "OSConfiguration": { - "macOS-11": { + "macOS-14": { "OSVmImage": "env:MACVMIMAGE", - "XCODE_VERSION": "12.5.1" + "XCODE_VERSION": "15.0.1" } }, "StaticConfigs": { diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml index cef2b9dfc..bfbcd4c07 100644 --- a/eng/pipelines/templates/variables/image.yml +++ b/eng/pipelines/templates/variables/image.yml @@ -21,7 +21,7 @@ variables: - name: WINDOWSPREVIOUSVMIMAGE value: azsdk-pool-mms-win-2019-1espt - name: MACVMIMAGE - value: macos-11 + value: macOS-14 # Values required for pool.os field in 1es pipeline templates - name: LINUXOS