Skip to content

Commit 94fdec2

Browse files
committed
Update MacOS and iOS CI jobs
According to updates on images: macos-12 deprecation we should use macos-13 and Xcode 14.3 as the lowest versions fo CI validation. Also, add ARM macos-14 image with separate script and job. Relates-To: DATASDK-47 Signed-off-by: Yaroslav Stefinko <[email protected]>
1 parent aac3dd4 commit 94fdec2

File tree

3 files changed

+66
-16
lines changed

3 files changed

+66
-16
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -176,45 +176,65 @@ 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-xcode-15-build:
180+
name: PSV.MacOS13.Xcode15
181+
runs-on: macOS-13
182182
steps:
183183
- name: Check out repository
184184
uses: actions/checkout@v4
185185
- name: MacOS Build
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-14-arm64-xcode-15-build:
190+
name: PSV.MacOS14.Xcode15
191+
runs-on: macos-14
192+
steps:
193+
- name: Check out repository
194+
uses: actions/checkout@v4
195+
- name: MacOS Build
196+
run: scripts/macos/psv/azure_macos_build_arm_psv.sh
197+
shell: bash
198+
199+
psv-macos-15-arm64-xcode-16-build:
200+
name: PSV.MacOS13.Xcode16
201+
runs-on: macos-15
202+
steps:
203+
- name: Check out repository
204+
uses: actions/checkout@v4
205+
- name: MacOS Build
206+
run: scripts/macos/psv/azure_macos_build_arm_psv.sh
207+
shell: bash
208+
209+
psv-ios-xcode-15-build:
210+
name: PSV.iOS.MacOS13.Xcode15
211+
runs-on: macOS-13
192212
steps:
193213
- name: Check out repository
194214
uses: actions/checkout@v4
195-
- name: iOS Xcode 14 Build
215+
- name: iOS Xcode 15 Build
196216
run: scripts/ios/azure_ios_build_psv.sh
197217
shell: bash
198218

199-
psv-ios-xcode-13-build:
200-
name: PSV.iOS.MacOS12.Xcode13
201-
runs-on: macOS-12
219+
psv-ios-xcode-14-build:
220+
name: PSV.iOS.MacOS13.Xcode14
221+
runs-on: macOS-13
202222
steps:
203223
- name: Check out repository
204224
uses: actions/checkout@v4
205-
- name: iOS Xcode 13 Build
225+
- name: iOS Xcode 14.3 Build
206226
run: scripts/ios/azure_ios_build_psv.sh
207227
shell: bash
208228
env:
209229
USE_LATEST_XCODE: 0
210230

211-
psv-ios-os13-xcode-15-build:
212-
name: PSV.iOS.MacOS13.Xcode15
213-
runs-on: macOS-13
231+
psv-ios-os15-xcode-16-build:
232+
name: PSV.iOS.MacOS13.Xcode16
233+
runs-on: macOS-15
214234
steps:
215235
- name: Check out repository
216236
uses: actions/checkout@v4
217-
- name: iOS Xcode 15 Build
237+
- name: iOS Xcode 16 Build
218238
run: scripts/ios/azure_ios_build_psv.sh
219239
shell: bash
220240

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
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/bash -e
2+
#
3+
# Copyright (C) 2024 HERE Europe B.V.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# SPDX-License-Identifier: Apache-2.0
18+
# License-Filename: LICENSE
19+
20+
21+
mkdir -p build
22+
cd build
23+
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
24+
-DCMAKE_CXX_FLAGS="-Wno-deprecated-builtins -Wno-deprecated-declarations -Wno-deprecated-copy" \
25+
-DOLP_SDK_BUILD_EXAMPLES=ON \
26+
-DBUILD_SHARED_LIBS=ON \
27+
-DOLP_SDK_ENABLE_TESTING=NO \
28+
..
29+
make -j
30+
cd ..

0 commit comments

Comments
 (0)