Skip to content

Commit 15de03d

Browse files
authored
CI: Add iOS/MacOS more new parralel builds (#1468)
Add all possible builds for iOS/MacOS. Correct tools versions in README.md. Relates-To: MINOR-IMPROVE-CI Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
1 parent f1c7b47 commit 15de03d

File tree

4 files changed

+53
-9
lines changed

4 files changed

+53
-9
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ jobs:
115115
run: scripts/macos/psv/azure_macos_build_psv.sh
116116
shell: bash
117117

118+
psv-macos-12-xcode-14-build:
119+
name: PSV.MacOS12.Xcode14
120+
runs-on: macOS-12
121+
steps:
122+
- name: Check out repository
123+
uses: actions/checkout@v2
124+
- name: MacOS Build
125+
run: scripts/macos/psv/azure_macos_build_psv.sh
126+
shell: bash
127+
118128
psv-ios-xcode-11-build:
119129
name: PSV.iOS.MacOS11.Xcode11.7
120130
runs-on: macOS-11
@@ -124,6 +134,38 @@ jobs:
124134
- name: iOS Xcode 11-7 Build
125135
run: scripts/ios/azure_ios_build_psv.sh
126136
shell: bash
137+
env:
138+
USE_LATEST_XCODE: 0
139+
140+
psv-ios-xcode-14-2-build:
141+
name: PSV.iOS.MacOS12.Xcode14.2
142+
runs-on: macOS-12
143+
steps:
144+
- name: Check out repository
145+
uses: actions/checkout@v2
146+
- name: iOS Xcode 14-2 Build
147+
run: scripts/ios/azure_ios_build_psv.sh
148+
shell: bash
149+
150+
psv-ios-os13-xcode-15-build:
151+
name: PSV.iOS.MacOS13.Xcode15
152+
runs-on: macOS-13
153+
steps:
154+
- name: Check out repository
155+
uses: actions/checkout@v2
156+
- name: iOS Xcode 15 Build
157+
run: scripts/ios/azure_ios_build_psv.sh
158+
shell: bash
159+
160+
psv-ios-os14-xcode-15-build:
161+
name: PSV.iOS.MacOS14.Xcode15
162+
runs-on: macOS-14
163+
steps:
164+
- name: Check out repository
165+
uses: actions/checkout@v2
166+
- name: iOS Xcode 15 Build
167+
run: scripts/ios/azure_ios_build_psv.sh
168+
shell: bash
127169

128170
psv-commit-checker:
129171
name: PSV.Commit.Checker

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ The table below lists the platforms on which the Data SDK has been tested.
6565
The table below lists the dependencies of the Data SDK.
6666

6767
| Library | Recommended version |
68-
| :------------------- | :------------------ |
68+
| :------------------- |:--------------------|
6969
| libcurl | 7.52.0 |
70-
| OpenSSL | 1.1.1g |
71-
| Boost (headers only) | 1.69.0 |
70+
| OpenSSL | 1.1.1t |
71+
| Boost (headers only) | 1.72.0 |
7272
| LevelDB | 1.21 |
7373
| Snappy | 1.1.7 |
7474
| RapidJSON | latest |

external/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2019-2021 HERE Europe B.V.
1+
# Copyright (C) 2019-2024 HERE Europe B.V.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

scripts/ios/azure_ios_build_psv.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -e
22
#
3-
# Copyright (C) 2019-2021 HERE Europe B.V.
3+
# Copyright (C) 2019-2024 HERE Europe B.V.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -22,10 +22,12 @@
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-
# Due to some bug which is cmake cannot detect compiler while called
26-
# from cmake itself when project is compiled with XCode 12.4 we must
27-
# switch to old XCode as a workaround.
28-
sudo xcode-select -s /Applications/Xcode_11.7.app
25+
if [[ ${USE_LATEST_XCODE} == 0 ]]; then
26+
# Due to some bug which is cmake cannot detect compiler while called
27+
# from cmake itself when project is compiled with XCode 12.4 we must
28+
# switch to old XCode as a workaround.
29+
sudo xcode-select -s /Applications/Xcode_11.7.app
30+
fi
2931

3032
mkdir -p build && cd build
3133
cmake ../ -GXcode \

0 commit comments

Comments
 (0)