From 1ba711e8e61e591cd30032659477cefbbf707d44 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 24 Oct 2023 18:50:24 -0400 Subject: [PATCH 1/2] [ci] Only use Xcode 14 on CI builds Xcode 14 has not yet been rolled out to all the PR builders. --- build-tools/automation/yaml-templates/commercial-build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/yaml-templates/commercial-build.yaml b/build-tools/automation/yaml-templates/commercial-build.yaml index f7c74a596bb..684bbc8f7fd 100644 --- a/build-tools/automation/yaml-templates/commercial-build.yaml +++ b/build-tools/automation/yaml-templates/commercial-build.yaml @@ -26,13 +26,14 @@ steps: # https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path - checkout: yaml-templates -- ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}: +- ${{ if ne(variables['MacBuildPoolName'], 'VSEng-Xamarin-RedmondMac-Android-Untrusted') }}: - script: > ls -l /Applications && sudo xcode-select --switch /Applications/Xcode_14.2.app && xcode-select --print-path displayName: Use Xcode 14.2 +- ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}: # Clone 'monodroid' without submodules - checkout: monodroid clean: true From 5225d1fa598e008e74701b8df0797296542813c6 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 24 Oct 2023 18:58:53 -0400 Subject: [PATCH 2/2] Use task condition --- .../automation/yaml-templates/commercial-build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-tools/automation/yaml-templates/commercial-build.yaml b/build-tools/automation/yaml-templates/commercial-build.yaml index 684bbc8f7fd..5a84b5b119b 100644 --- a/build-tools/automation/yaml-templates/commercial-build.yaml +++ b/build-tools/automation/yaml-templates/commercial-build.yaml @@ -26,12 +26,12 @@ steps: # https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path - checkout: yaml-templates -- ${{ if ne(variables['MacBuildPoolName'], 'VSEng-Xamarin-RedmondMac-Android-Untrusted') }}: - - script: > - ls -l /Applications && - sudo xcode-select --switch /Applications/Xcode_14.2.app && - xcode-select --print-path - displayName: Use Xcode 14.2 +- script: > + ls -l /Applications && + sudo xcode-select --switch /Applications/Xcode_14.2.app && + xcode-select --print-path + displayName: Use Xcode 14.2 + condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real')) - ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}: # Clone 'monodroid' without submodules