From 8fa5ca79be73caa6260fa2c893f58837125876fc Mon Sep 17 00:00:00 2001
From: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
Date: Mon, 11 Nov 2024 23:51:25 +0200
Subject: [PATCH] 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 <ext-yaroslav.stefinko@here.com>
---
 .github/workflows/psv_pipelines.yml | 62 +++++++++++++++++++++--------
 scripts/ios/azure_ios_build_psv.sh  |  2 +-
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/psv_pipelines.yml b/.github/workflows/psv_pipelines.yml
index b25075d7b..7c4f76b03 100644
--- a/.github/workflows/psv_pipelines.yml
+++ b/.github/workflows/psv_pipelines.yml
@@ -176,45 +176,75 @@ jobs:
       run: scripts/android/build.sh
       shell: bash
 
-  psv-macos-12-xcode-14-build:
-    name: PSV.MacOS12.Xcode14
-    runs-on: macOS-12
+  psv-macos-13-x86_64-xcode-15-build:
+    name: PSV.MacOS13.Xcode15
+    runs-on: macOS-13
     steps:
     - name: Check out repository
       uses: actions/checkout@v4
-    - name: MacOS Build
+    - name: MacOS Build Xcode15
       run: scripts/macos/psv/azure_macos_build_psv.sh
       shell: bash
 
-  psv-ios-xcode-14-build:
-    name: PSV.iOS.MacOS12.Xcode14
-    runs-on: macOS-12
+  psv-macos-13-xcode-15-build:
+    name: PSV.MacOS13.Xcode15
+    runs-on: macos-13-xlarge
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: MacOS Build Xcode15
+      run: scripts/macos/psv/azure_macos_build_psv.sh
+      shell: bash
+
+  psv-macos-14-arm64-xcode-15-build:
+    name: PSV.MacOS14.Xcode15
+    runs-on: macos-14
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: MacOS Build Xcode15
+      run: scripts/macos/psv/azure_macos_build_psv.sh
+      shell: bash
+
+  psv-macos-15-arm64-xcode-16-build:
+    name: PSV.MacOS13.Xcode16
+    runs-on: macos-15
     steps:
     - name: Check out repository
       uses: actions/checkout@v4
-    - name: iOS Xcode 14 Build
+    - name: MacOS Build Xcode16
+      run: scripts/macos/psv/azure_macos_build_psv.sh
+      shell: bash
+
+  psv-ios-xcode-15-build:
+    name: PSV.iOS.MacOS13.Xcode15
+    runs-on: macOS-13
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: iOS Xcode 15 Build
       run: scripts/ios/azure_ios_build_psv.sh
       shell: bash
 
-  psv-ios-xcode-13-build:
-    name: PSV.iOS.MacOS12.Xcode13
-    runs-on: macOS-12
+  psv-ios-xcode-14-build:
+    name: PSV.iOS.MacOS13.Xcode14
+    runs-on: macOS-13
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
-      - name: iOS Xcode 13 Build
+      - name: iOS Xcode 14.3 Build
         run: scripts/ios/azure_ios_build_psv.sh
         shell: bash
         env:
           USE_LATEST_XCODE: 0
 
-  psv-ios-os13-xcode-15-build:
-    name: PSV.iOS.MacOS13.Xcode15
-    runs-on: macOS-13
+  psv-ios-os15-xcode-16-build:
+    name: PSV.iOS.MacOS13.Xcode16
+    runs-on: macOS-15
     steps:
     - name: Check out repository
       uses: actions/checkout@v4
-    - name: iOS Xcode 15 Build
+    - name: iOS Xcode 16 Build
       run: scripts/ios/azure_ios_build_psv.sh
       shell: bash
 
diff --git a/scripts/ios/azure_ios_build_psv.sh b/scripts/ios/azure_ios_build_psv.sh
index 92e7f7bad..b633181b1 100755
--- a/scripts/ios/azure_ios_build_psv.sh
+++ b/scripts/ios/azure_ios_build_psv.sh
@@ -26,7 +26,7 @@ if [[ ${USE_LATEST_XCODE} == 0 ]]; 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_13.1.app
+  sudo xcode-select -s /Applications/Xcode_14.3.app
 fi
 
 mkdir -p build && cd build