From 68c6912edf7f18467851c0eb7a258d739561f435 Mon Sep 17 00:00:00 2001 From: Edward Chen <18449977+edgchen1@users.noreply.github.com> Date: Mon, 19 Aug 2024 09:48:56 -0700 Subject: [PATCH] Use Xcode 14.3.1 in CI pipelines. --- .pipelines/mac-ios-spm-dev-validation-pipeline.yml | 3 --- .pipelines/mac-ios-spm-extensions-validation-pipeline.yml | 3 --- .pipelines/mac-ios-spm-release-validation-pipeline.yml | 5 ----- .pipelines/templates/use-xcode-version.yml | 2 +- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.pipelines/mac-ios-spm-dev-validation-pipeline.yml b/.pipelines/mac-ios-spm-dev-validation-pipeline.yml index db16e85..2cc06cc 100644 --- a/.pipelines/mac-ios-spm-dev-validation-pipeline.yml +++ b/.pipelines/mac-ios-spm-dev-validation-pipeline.yml @@ -6,15 +6,12 @@ vmImage: "macOS-13" variables: - xcodeVersion: "14.3" artifactsName: "ios_packaging_artifacts_full" timeoutInMinutes: 60 steps: - template: templates/use-xcode-version.yml - parameters: - xcodeVersion: ${{ variables.xcodeVersion }} # Download artifacts from a specific pipeline # It consumes a latest dev version ORT iOS Pod which should match with the source code diff --git a/.pipelines/mac-ios-spm-extensions-validation-pipeline.yml b/.pipelines/mac-ios-spm-extensions-validation-pipeline.yml index d0ecf23..1441eb7 100644 --- a/.pipelines/mac-ios-spm-extensions-validation-pipeline.yml +++ b/.pipelines/mac-ios-spm-extensions-validation-pipeline.yml @@ -6,7 +6,6 @@ vmImage: "macOS-13" variables: - xcodeVersion: "14.3" artifactsName: "ios_packaging_artifacts_full" artifactsNameForExt: "ios_packaging_artifacts" @@ -14,8 +13,6 @@ steps: - template: templates/use-xcode-version.yml - parameters: - xcodeVersion: ${{ variables.xcodeVersion }} - script: | mkdir tmp diff --git a/.pipelines/mac-ios-spm-release-validation-pipeline.yml b/.pipelines/mac-ios-spm-release-validation-pipeline.yml index 656d494..53d1b12 100644 --- a/.pipelines/mac-ios-spm-release-validation-pipeline.yml +++ b/.pipelines/mac-ios-spm-release-validation-pipeline.yml @@ -5,15 +5,10 @@ pool: vmImage: "macOS-13" - variables: - xcodeVersion: "14.3" - timeoutInMinutes: 60 steps: - template: templates/use-xcode-version.yml - parameters: - xcodeVersion: ${{ variables.xcodeVersion }} # Note: Running xcodebuild test on `onnxruntime-Package` scheme will perform swift tests for both OnnxRuntimeBindings # and OnnxRuntimeExtensions targets. diff --git a/.pipelines/templates/use-xcode-version.yml b/.pipelines/templates/use-xcode-version.yml index c267ecd..0d0a3cd 100644 --- a/.pipelines/templates/use-xcode-version.yml +++ b/.pipelines/templates/use-xcode-version.yml @@ -3,7 +3,7 @@ parameters: - name: xcodeVersion type: string - default: "14.3" + default: "14.3.1" steps: - bash: |