From 4c0dca14113a78187adcc240fd02247fd27b653a Mon Sep 17 00:00:00 2001
From: merni-ns <66267867+merni-ns@users.noreply.github.com>
Date: Sat, 16 Mar 2024 19:41:23 +0530
Subject: [PATCH] Codechange: [CI] Move Release CI build to MacOS runner
 (#12309)

---
 .github/workflows/ci-build.yml | 18 ++++++++++--------
 .github/workflows/ci-macos.yml |  5 +++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 0cedad4c61..c823b92dfa 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -25,15 +25,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - name: Clang - Debug
+        - name: Clang
           compiler: clang-15
           cxxcompiler: clang++-15
           libraries: libsdl2-dev
-        - name: Clang - Release
-          compiler: clang-15
-          cxxcompiler: clang++-15
-          libraries: libsdl2-dev
-          extra-cmake-parameters: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTION_USE_ASSERTS=OFF
         - name: GCC - SDL2
           compiler: gcc
           cxxcompiler: g++
@@ -61,10 +56,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - arch: arm64
+        - name: arm64 - Debug
+          arch: arm64
           full_arch: arm64
+          extra-cmake-parameters: -DCMAKE_BUILD=Debug
+        - name: arm64 - Release
+          arch: arm64
+          full_arch: arm64
+          extra-cmake-parameters: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTION_USE_ASSERTS=OFF
 
-    name: Mac OS (${{ matrix.arch }})
+    name: Mac OS (${{ matrix.name }})
 
     uses: ./.github/workflows/ci-macos.yml
     secrets: inherit
@@ -72,6 +73,7 @@ jobs:
     with:
       arch: ${{ matrix.arch }}
       full_arch: ${{ matrix.full_arch }}
+      extra-cmake-parameters: ${{ matrix.extra-cmake-parameters }}
 
   windows:
     strategy:
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index f4f30a606b..e6f5d623de 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -9,6 +9,10 @@ on:
       full_arch:
         required: true
         type: string
+      extra-cmake-parameters:
+        required: false
+        type: string
+        default: ""
 
 env:
   CTEST_OUTPUT_ON_FAILURE: 1
@@ -66,6 +70,7 @@ jobs:
           -DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \
           -DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \
           -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          ${{ inputs.extra-cmake-parameters }} \
           # EOF
         echo "::endgroup::"