diff --git a/.github/workflows/psv_pipelines.yml b/.github/workflows/psv_pipelines.yml index 1e76e753d..0528b9d44 100644 --- a/.github/workflows/psv_pipelines.yml +++ b/.github/workflows/psv_pipelines.yml @@ -223,7 +223,7 @@ jobs: run: scripts/ios/azure_ios_build_psv.sh shell: bash env: - USE_LATEST_XCODE: 0 + SELECT_XCODE_LOCATION: "/Applications/Xcode_14.3.app" psv-ios-os15-arm64-xcode-16-build: name: PSV.iOS.MacOS15.Xcode16 @@ -234,6 +234,8 @@ jobs: - name: iOS Xcode 16 Build run: scripts/ios/azure_ios_build_psv.sh shell: bash + env: + SELECT_XCODE_LOCATION: "/Applications/Xcode_16.4.app" psv-ios-os14-arm64-xcode-15-build: name: PSV.iOS.MacOS14.Xcode15 diff --git a/scripts/ios/azure_ios_build_psv.sh b/scripts/ios/azure_ios_build_psv.sh index b633181b1..9c804bfaf 100755 --- a/scripts/ios/azure_ios_build_psv.sh +++ b/scripts/ios/azure_ios_build_psv.sh @@ -22,11 +22,11 @@ # Sometimes there is no boost and there is no need to fail in this case. brew uninstall --ignore-dependencies boost || true -if [[ ${USE_LATEST_XCODE} == 0 ]]; then +if [[ -n ${SELECT_XCODE_LOCATION} ]]; then # Due to some bug which is cmake cannot detect compiler while called # from cmake itself when project is compiled with XCode 12.4 we must # switch to old XCode as a workaround. - sudo xcode-select -s /Applications/Xcode_14.3.app + sudo xcode-select -s ${SELECT_XCODE_LOCATION} fi mkdir -p build && cd build