Skip to content

Commit 9f6836f

Browse files
Debug: Try to satisfy CI needs
Relates-To: MINOR Signed-off-by: Rustam Gamidov <[email protected]>
1 parent 25ffe4f commit 9f6836f

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ jobs:
223223
run: scripts/ios/azure_ios_build_psv.sh
224224
shell: bash
225225
env:
226-
USE_LATEST_XCODE: 0
226+
SELECT_XCODE_LOCATION: "/Applications/Xcode_14.3.app"
227227

228228
psv-ios-os15-arm64-xcode-16-build:
229229
name: PSV.iOS.MacOS15.Xcode16
@@ -234,6 +234,8 @@ jobs:
234234
- name: iOS Xcode 16 Build
235235
run: scripts/ios/azure_ios_build_psv.sh
236236
shell: bash
237+
env:
238+
SELECT_XCODE_LOCATION: "/Applications/Xcode_16.4.app"
237239

238240
psv-ios-os14-arm64-xcode-15-build:
239241
name: PSV.iOS.MacOS14.Xcode15

cmake/ios/tester/Base.lproj/Main.storyboard

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.49" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
7-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
7+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
88
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1010
</dependencies>

scripts/ios/azure_ios_build_psv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Sometimes there is no boost and there is no need to fail in this case.
2323
brew uninstall --ignore-dependencies boost || true
2424

25-
if [[ ${USE_LATEST_XCODE} == 0 ]]; then
25+
if [[ -n ${SELECT_XCODE_LOCATION} ]]; then
2626
# Due to some bug which is cmake cannot detect compiler while called
2727
# from cmake itself when project is compiled with XCode 12.4 we must
2828
# switch to old XCode as a workaround.

0 commit comments

Comments
 (0)