Skip to content

Commit 0cd2288

Browse files
authored
Update Apple CI jobs, skip boost compile warning (#1563)
According to updates on images: macos-12 deprecation we should use macos-13 and Xcode 14.3 as the lowest versions in CI validation. Also, add х86_64 macos-13 image with job separately, while other images are by default on ARM. Additional compiler options are related boost internal warnings on newer xcodes. Add more MacOS jobs to cover more combinations: MacOS-Xcode. Relates-TO: DATASDK-47 Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
1 parent 94a69cc commit 0cd2288

File tree

3 files changed

+48
-17
lines changed

3 files changed

+48
-17
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,45 +176,75 @@ jobs:
176176
run: scripts/android/build.sh
177177
shell: bash
178178

179-
psv-macos-12-xcode-14-build:
180-
name: PSV.MacOS12.Xcode14
181-
runs-on: macOS-12
179+
psv-macos-13-x86_64-xcode-15-build:
180+
name: PSV.MacOS13.Xcode15.x86_64
181+
runs-on: macOS-13
182182
steps:
183183
- name: Check out repository
184184
uses: actions/checkout@v4
185-
- name: MacOS Build
185+
- name: MacOS Build Xcode15
186186
run: scripts/macos/psv/azure_macos_build_psv.sh
187187
shell: bash
188188

189-
psv-ios-xcode-14-build:
190-
name: PSV.iOS.MacOS12.Xcode14
191-
runs-on: macOS-12
189+
psv-macos-13-xcode-15-build:
190+
name: PSV.MacOS13.Xcode15
191+
runs-on: macos-13-xlarge
192+
steps:
193+
- name: Check out repository
194+
uses: actions/checkout@v4
195+
- name: MacOS Build Xcode15
196+
run: scripts/macos/psv/azure_macos_build_psv.sh
197+
shell: bash
198+
199+
psv-macos-14-xcode-15-build:
200+
name: PSV.MacOS14.Xcode15
201+
runs-on: macos-14
202+
steps:
203+
- name: Check out repository
204+
uses: actions/checkout@v4
205+
- name: MacOS Build Xcode15
206+
run: scripts/macos/psv/azure_macos_build_psv.sh
207+
shell: bash
208+
209+
psv-macos-15-arm64-xcode-16-build:
210+
name: PSV.MacOS13.Xcode16
211+
runs-on: macos-15
192212
steps:
193213
- name: Check out repository
194214
uses: actions/checkout@v4
195-
- name: iOS Xcode 14 Build
215+
- name: MacOS Build Xcode16
216+
run: scripts/macos/psv/azure_macos_build_psv.sh
217+
shell: bash
218+
219+
psv-ios-xcode-15-build:
220+
name: PSV.iOS.MacOS13.Xcode15
221+
runs-on: macOS-13
222+
steps:
223+
- name: Check out repository
224+
uses: actions/checkout@v4
225+
- name: iOS Xcode 15 Build
196226
run: scripts/ios/azure_ios_build_psv.sh
197227
shell: bash
198228

199-
psv-ios-xcode-13-build:
200-
name: PSV.iOS.MacOS12.Xcode13
201-
runs-on: macOS-12
229+
psv-ios-xcode-14-build:
230+
name: PSV.iOS.MacOS13.Xcode14
231+
runs-on: macOS-13
202232
steps:
203233
- name: Check out repository
204234
uses: actions/checkout@v4
205-
- name: iOS Xcode 13 Build
235+
- name: iOS Xcode 14.3 Build
206236
run: scripts/ios/azure_ios_build_psv.sh
207237
shell: bash
208238
env:
209239
USE_LATEST_XCODE: 0
210240

211-
psv-ios-os13-xcode-15-build:
212-
name: PSV.iOS.MacOS13.Xcode15
213-
runs-on: macOS-13
241+
psv-ios-os15-xcode-16-build:
242+
name: PSV.iOS.MacOS13.Xcode16
243+
runs-on: macOS-15
214244
steps:
215245
- name: Check out repository
216246
uses: actions/checkout@v4
217-
- name: iOS Xcode 15 Build
247+
- name: iOS Xcode 16 Build
218248
run: scripts/ios/azure_ios_build_psv.sh
219249
shell: bash
220250

scripts/ios/azure_ios_build_psv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [[ ${USE_LATEST_XCODE} == 0 ]]; 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.
29-
sudo xcode-select -s /Applications/Xcode_13.1.app
29+
sudo xcode-select -s /Applications/Xcode_14.3.app
3030
fi
3131

3232
mkdir -p build && cd build

scripts/macos/psv/azure_macos_build_psv.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
mkdir -p build
2222
cd build
2323
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
24+
-DCMAKE_CXX_FLAGS="-Wno-deprecated-builtins -Wno-deprecated-declarations -Wno-deprecated-copy" \
2425
-DOLP_SDK_BUILD_EXAMPLES=ON \
2526
-DBUILD_SHARED_LIBS=ON \
2627
-DOLP_SDK_ENABLE_TESTING=NO \

0 commit comments

Comments
 (0)